diff --git a/assets/controllers/ajax_modal_controller.js b/assets/controllers/ajax_modal_controller.js
index d3965c7..f418a63 100644
--- a/assets/controllers/ajax_modal_controller.js
+++ b/assets/controllers/ajax_modal_controller.js
@@ -3,7 +3,7 @@ import { useFetch } from '../mixins/use_fetch'
 
 export default class extends Controller {
 
-    static targets = [ 'title', 'content', 'spinner', 'backbutton' ]
+    static targets = [ 'title', 'content', 'spinner' ]
     static values = { loading: Boolean }
 
     connect() {
@@ -41,9 +41,7 @@ export default class extends Controller {
         this.loadingValue = true
         const form = event.target
         const formData = new FormData(form)
-        if (this.hasBackbuttonTarget && event.submitter === this.backbuttonTarget) {
-            formData.append(this.backbuttonTarget.name, this.backbuttonTarget.value)
-        }
+        formData.append(event.submitter.name, event.submitter.value)
         fetch(form.action, this.getInitObject('post', formData))
             .then(this.checkStatus)
             .then(this.parseJSON)
diff --git a/src/Controller/Admin/Assignment/IndexController.php b/src/Controller/Admin/Assignment/IndexController.php
index ebb403a..a84e2bf 100644
--- a/src/Controller/Admin/Assignment/IndexController.php
+++ b/src/Controller/Admin/Assignment/IndexController.php
@@ -24,12 +24,7 @@ class IndexController extends AbstractController
     #[IsGranted('ROLE_ADMINISTRATIVE')]
     public function index(Request $request): Response
     {
-        $this->filterHandler->setNamespace('filter:assignment:admin');
-        $filterForm = $this->filterHandler->getForm();
-        $filterDto = $this->filterHandler->handleRequest($filterForm, $request);
-        if (true === $filterDto->isReset()) {
-            return $this->redirectToRoute('app_admin_assignment_index');
-        }
+        $filterDto = $this->filterHandler->getFilterSettings();
 
         $query = $this
             ->assignmentRepository
@@ -48,7 +43,6 @@ class IndexController extends AbstractController
 
         return $this->render('admin/assignment/index.html.twig', [
             'pagination' => $pagination,
-            'filterForm' => $filterForm,
             'filterDto' => $filterDto,
         ]);
     }
diff --git a/src/Controller/Common/AssignmentFilterController.php b/src/Controller/Common/AssignmentFilterController.php
new file mode 100644
index 0000000..52ba5f1
--- /dev/null
+++ b/src/Controller/Common/AssignmentFilterController.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Controller\Common;
+
+use App\Controller\Traits\ReturnUrlTrait;
+use App\Form\AssignmentFilterType;
+use App\Model\AjaxModalResponseDto;
+use App\Repository\AssignmentRepository;
+use App\Service\Common\AssignmentFilterHandler;
+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 AssignmentFilterController extends AbstractController
+{
+    use ReturnUrlTrait;
+
+    public function __construct(
+        private readonly AssignmentFilterHandler $filterHandler,
+        private readonly AssignmentRepository $assignmentRepository
+    ) {
+    }
+
+    #[Route('/common/assignment/filter', name: 'app_common_assignment_filter')]
+    #[IsGranted('ROLE_USER')]
+    public function index(Request $request): JsonResponse
+    {
+        $response = new AjaxModalResponseDto();
+        $formAction = $this->generateUrl('app_common_assignment_filter', ['r' => $request->query->get('r')]);
+        $formData = $this->filterHandler->getFilterSettings();
+        $filterOptions = $this->assignmentRepository->getFilterOptions();
+        $formOptions = [
+            'action' => $formAction,
+            'ajax_submit' => true,
+            'min_date' => $filterOptions['minDate'],
+            'max_date' => $filterOptions['maxDate'],
+            'job_profiles' => $filterOptions['jobProfiles'],
+            'destinations' => $filterOptions['destinations'],
+        ];
+
+        $form = $this->createForm(AssignmentFilterType::class, $formData, $formOptions);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->filterHandler->handleRequest($form);
+            $returnUrl = $this->getReturnUrl($request, 'app_admin_assignment_index');
+            $response->setCloseAndRedirect($returnUrl);
+        } else {
+            $response->setContent($this->renderView('common/assignment_filter.html.twig', [
+                'filterForm' => $form,
+                'filterDto' => $form->getData(),
+            ]));
+        }
+
+        return $this->json($response);
+    }
+}
\ No newline at end of file
diff --git a/src/Controller/Teamer/IndexController.php b/src/Controller/Teamer/IndexController.php
index 94aa8b2..3ba05ef 100644
--- a/src/Controller/Teamer/IndexController.php
+++ b/src/Controller/Teamer/IndexController.php
@@ -34,12 +34,7 @@ class IndexController extends AbstractController
         // Validate teamer data to show missing data right away
         $errors = $this->validator->validate($teamer, null, ['profile_preflight']);
 
-        $this->filterHandler->setNamespace('filter:assignment:teamer');
-        $filterForm = $this->filterHandler->getForm();
-        $filterDto = $this->filterHandler->handleRequest($filterForm, $request);
-        if (true === $filterDto->isReset()) {
-            return $this->redirectToRoute('app_teamer_index');
-        }
+        $filterDto = $this->filterHandler->getFilterSettings();
 
         $query = $this
             ->assignmentRepository
@@ -60,7 +55,6 @@ class IndexController extends AbstractController
             'teamer' => $teamer,
             'errors' => $errors,
             'pagination' => $pagination,
-            'filterForm' => $filterForm,
             'filterDto' => $filterDto,
         ]);
     }
diff --git a/src/Service/Common/AssignmentFilterHandler.php b/src/Service/Common/AssignmentFilterHandler.php
index 9c4dd0b..978caf8 100644
--- a/src/Service/Common/AssignmentFilterHandler.php
+++ b/src/Service/Common/AssignmentFilterHandler.php
@@ -2,15 +2,11 @@
 
 namespace App\Service\Common;
 
-use App\Entity\Assignment;
 use App\Entity\Destination;
 use App\Entity\JobProfile;
-use App\Form\AssignmentFilterType;
 use App\Model\AssignmentFilterDto;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
@@ -20,8 +16,7 @@ class AssignmentFilterHandler
 
     public function __construct(
         private readonly RequestStack $requestStack,
-        private readonly EntityManagerInterface $entityManager,
-        private readonly FormFactoryInterface $formFactory,
+        private readonly EntityManagerInterface $entityManager
     ) {
     }
 
@@ -32,44 +27,21 @@ class AssignmentFilterHandler
         return $this;
     }
 
-    public function getForm(): FormInterface
+    public function handleRequest(FormInterface $form): AssignmentFilterDto
     {
-        $filterDto = $this->getFilterSettings();
-
-        $assignmentRepository = $this
-            ->entityManager
-            ->getRepository(Assignment::class)
-        ;
-        $filterOptions = $assignmentRepository->getFilterOptions();
-
-        return $this->formFactory->create(AssignmentFilterType::class, $filterDto, [
-            'min_date' => $filterOptions['minDate'],
-            'max_date' => $filterOptions['maxDate'],
-            'job_profiles' => $filterOptions['jobProfiles'],
-            'destinations' => $filterOptions['destinations'],
-        ]);
-    }
-
-    public function handleRequest(
-        FormInterface $form,
-        Request $request
-    ): AssignmentFilterDto {
-        $form->handleRequest($request);
         $filterDto = $form->getData();
 
-        if ($form->isSubmitted() && $form->isValid()) {
-            if ($form->has('reset') && $form->get('reset')->isClicked()) {
-                $filterDto = new AssignmentFilterDto(true);
-                $this->getSession()->remove($this->namespace);
-            } elseif ($form->has('apply') && $form->get('apply')->isClicked()) {
-                $this->saveFilterSettings($filterDto);
-            }
+        if ($form->get('reset')->isClicked()) {
+            $filterDto = new AssignmentFilterDto(true);
+            $this->getSession()->remove($this->namespace);
+        } elseif ($form->get('apply')->isClicked()) {
+            $this->saveFilterSettings($filterDto);
         }
 
         return $filterDto;
     }
 
-    private function getFilterSettings(): AssignmentFilterDto
+    public function getFilterSettings(): AssignmentFilterDto
     {
         if (null === $data = $this->getSession()->get($this->namespace)) {
             return new AssignmentFilterDto();
diff --git a/templates/_partials/_filterpanel.html.twig b/templates/_partials/_filterpanel.html.twig
deleted file mode 100644
index 797ca16..0000000
--- a/templates/_partials/_filterpanel.html.twig
+++ /dev/null
@@ -1,25 +0,0 @@
-{{ form_start(filterForm) }}
-<div class="border border-gray-200 rounded-md p-2 mb-4" {{stimulus_controller('toggle', [], {'closed': 'hidden'}) }}>
-    <button type="button" {{ stimulus_action('toggle', 'toggle') }}
-            class="btn btn--small">
-        <div class="flex items-center space-x-2">
-            {{ icon('filter', 'w-5 h-5') }}
-            {% if filterDto.active %}<span>{{ filterDto.activeFiltersCount }} Filter aktiv</span>{% endif %}
-        </div>
-    </button>
-    <div class="hidden" {{ stimulus_target('toggle', 'toggle') }}>
-        <div class="grid grid-cols-2 md:grid-cols-5 gap-x-1 gap-y-2 py-2">
-            {{ form_row(filterForm.dateFrom) }}
-            {{ form_row(filterForm.dateTo) }}
-            {{ form_row(filterForm.jobProfile) }}
-            {{ form_row(filterForm.destination) }}
-            {{ form_row(filterForm.duration) }}
-        </div>
-        <div class="flex items-center space-x-2">
-            {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn btn--small' } }) }}
-            {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--small btn--secondary' } }) }}
-        </div>
-    </div>
-</div>
-{{ form_rest(filterForm) }}
-{{ form_end(filterForm) }}
diff --git a/templates/admin/assignment/index.html.twig b/templates/admin/assignment/index.html.twig
index dbd5ddb..585b5e7 100644
--- a/templates/admin/assignment/index.html.twig
+++ b/templates/admin/assignment/index.html.twig
@@ -3,11 +3,23 @@
 {% block title %}Einsatzübersicht{% endblock %}
 
 {% block content %}
-    <h1 class="text-2xl font-bold pb-4">
-        Einsatzübersicht
-    </h1>
-
-    {% include '_partials/_filterpanel.html.twig' %}
+    <div class="flex items-start justify-between">
+        <h1 class="text-2xl font-bold pb-4">
+            Einsatzübersicht
+        </h1>
+        <button type="button"
+                class="{{ html_classes('btn btn--small', { 'btn--secondary': filterDto.active }) }}"
+                {{ stimulus_controller('modal-button', [], [], {'ajax-modal': '#ajax-modal'}) }}
+                {{ stimulus_action('modal-button', 'ajax', null, {
+                    'title': 'Einsätze filtern',
+                    'url': path('app_common_assignment_filter', { 'r': return_url() })
+                }) }}>
+            <div class="flex items-center space-x-1">
+                {{ icon('filter', 'w-5 h-5 shrink-0') }}
+                {% if filterDto.active %}<span>{{ filterDto.activeFiltersCount }} Filter aktiv</span>{% endif %}
+            </div>
+        </button>
+    </div>
 
     <div class="data-table-wrapper">
         <div class="data-table-wrapper__inner">
diff --git a/templates/common/assignment_filter.html.twig b/templates/common/assignment_filter.html.twig
new file mode 100644
index 0000000..f2a19c0
--- /dev/null
+++ b/templates/common/assignment_filter.html.twig
@@ -0,0 +1,14 @@
+{{ form_start(filterForm) }}
+<div class="flex flex-col space-y-2 pb-2">
+    {{ form_row(filterForm.dateFrom) }}
+    {{ form_row(filterForm.dateTo) }}
+    {{ form_row(filterForm.jobProfile) }}
+    {{ form_row(filterForm.destination) }}
+    {{ form_row(filterForm.duration) }}
+</div>
+<div class="flex items-center space-x-2">
+    {{ form_widget(filterForm.apply, { 'attr': { 'class': 'btn' } }) }}
+    {{ form_widget(filterForm.reset, { 'attr': { 'class': 'btn btn--secondary' } }) }}
+</div>
+{{ form_rest(filterForm) }}
+{{ form_end(filterForm) }}
diff --git a/templates/teamer/index.html.twig b/templates/teamer/index.html.twig
index db776dc..220ed27 100644
--- a/templates/teamer/index.html.twig
+++ b/templates/teamer/index.html.twig
@@ -3,9 +3,23 @@
 {% block title %}Einsatzübersicht{% endblock %}
 
 {% block content %}
-    <h1 class="text-2xl font-bold pb-4">
-        Einsatzübersicht
-    </h1>
+    <div class="flex items-start justify-between">
+        <h1 class="text-2xl font-bold pb-4">
+            Einsatzübersicht
+        </h1>
+        <button type="button"
+                class="{{ html_classes('btn btn--small', { 'btn--secondary': filterDto.active }) }}"
+                {{ stimulus_controller('modal-button', [], [], {'ajax-modal': '#ajax-modal'}) }}
+                {{ stimulus_action('modal-button', 'ajax', null, {
+                    'title': 'Einsätze filtern',
+                    'url': path('app_common_assignment_filter', { 'r': return_url() })
+                }) }}>
+            <div class="flex items-center space-x-1">
+                {{ icon('filter', 'w-5 h-5 shrink-0') }}
+                {% if filterDto.active %}<span>{{ filterDto.activeFiltersCount }} Filter aktiv</span>{% endif %}
+            </div>
+        </button>
+    </div>
     {% if errors|length %}
         <div class="border border-red-500 rounded-md p-4 text-red-500 mb-8">
             <ul>
@@ -18,8 +32,6 @@
         </div>
     {% endif %}
 
-    {% include '_partials/_filterpanel.html.twig' %}
-
     {{ knp_pagination_render(pagination, 'paginator/sliding_boxes.html.twig') }}
     <div class="grid sm:grid-cols-2 md:grid-cols-3 gap-4 py-4">
         {% for assignment in pagination %}