diff --git a/src/Controller/Admin/System/Availability/CreateController.php b/src/Controller/Admin/System/Availability/CreateController.php
index 4bd42e8..e2c3595 100644
--- a/src/Controller/Admin/System/Availability/CreateController.php
+++ b/src/Controller/Admin/System/Availability/CreateController.php
@@ -44,7 +44,7 @@ class CreateController extends AbstractController
             $redirectUrl = $this->generateUrl('app_admin_system_availability_index');
             $response->setCloseAndRedirect($redirectUrl);
         } else {
-            $content = $this->renderView('admin/system/availability/create.html.twig', [
+            $content = $this->renderView('admin/system/availability/form.html.twig', [
                 'form' => $form,
             ]);
             $response->setContent($content);
diff --git a/src/Controller/Admin/System/Availability/EditController.php b/src/Controller/Admin/System/Availability/EditController.php
new file mode 100644
index 0000000..a94580c
--- /dev/null
+++ b/src/Controller/Admin/System/Availability/EditController.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Controller\Admin\System\Availability;
+
+use App\Entity\Availability;
+use App\Form\AvailabilityType;
+use App\Model\AjaxModalResponseDto;
+use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+class EditController extends AbstractController
+{
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+        private readonly LoggerInterface $logger
+    ) {
+    }
+
+    #[Route('/admin/system/availability/edit/{id}', name: 'app_admin_system_availability_edit')]
+    #[IsGranted('ROLE_ADMIN')]
+    public function index(Availability $availability, Request $request): JsonResponse
+    {
+        $response = new AjaxModalResponseDto();
+        $action = $this->generateUrl('app_admin_system_availability_edit', ['id' => $availability->getId()]);
+
+        $form = $this->createForm(AvailabilityType::class, $availability, ['action' => $action, 'ajax_submit' => true]);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->entityManager->flush();
+
+            $this->addFlash('success', 'Die Verfügbarkeit wurde aktualisiert');
+            $this->logger->info('Edit availability', [
+                'availability' => $availability,
+            ]);
+
+            $redirectUrl = $this->generateUrl('app_admin_system_availability_index');
+            $response->setCloseAndRedirect($redirectUrl);
+        } else {
+            $content = $this->renderView('admin/system/availability/form.html.twig', [
+                'form' => $form
+            ]);
+            $response->setContent($content);
+        }
+
+        return $this->json($response);
+    }
+}
\ No newline at end of file
diff --git a/templates/admin/system/availability/create.html.twig b/templates/admin/system/availability/form.html.twig
similarity index 100%
rename from templates/admin/system/availability/create.html.twig
rename to templates/admin/system/availability/form.html.twig
diff --git a/templates/admin/system/availability/index.html.twig b/templates/admin/system/availability/index.html.twig
index 1fdcec7..dbfd1ce 100644
--- a/templates/admin/system/availability/index.html.twig
+++ b/templates/admin/system/availability/index.html.twig
@@ -47,6 +47,14 @@
                                         }) }}>
                                     {{ icon('delete') }}
                                 </button>
+                                <button type="button"
+                                        {{ stimulus_controller('modal-button', [], [], {'ajax-modal': '#ajax-modal'}) }}
+                                        {{ stimulus_action('modal-button', 'ajax', null, {
+                                            'title': 'Verfügbarkeit bearbeiten',
+                                            'url': path('app_admin_system_availability_edit', { 'id': availability.id })
+                                        }) }}>
+                                    {{ icon('edit') }}
+                                </button>
                             </div>
                         </td>
                     </tr>