diff --git a/src/Controller/Administrative/Questionnaire/TestController.php b/src/Controller/Administrative/Questionnaire/TestController.php
index 53d3dcc..f6fa118 100644
--- a/src/Controller/Administrative/Questionnaire/TestController.php
+++ b/src/Controller/Administrative/Questionnaire/TestController.php
@@ -69,7 +69,7 @@ class TestController extends AbstractController
             'submitted' => $submitted,
             'draft' => $draft,
             'busEscort' => $busEscort,
-            'returnUrl' => $this->getReturnUrl($request, 'app_administrative_assignment_detail', ['uuid' => $assignment->getUuid()]),
+            'returnUrl' => $this->getReturnUrl($request, 'app_administrative_assignment_index'),
         ]);
     }
 }
diff --git a/templates/administrative/assignment/detail.html.twig b/templates/administrative/assignment/detail.html.twig
index 7209a06..0e2f3a5 100644
--- a/templates/administrative/assignment/detail.html.twig
+++ b/templates/administrative/assignment/detail.html.twig
@@ -256,15 +256,8 @@
                 </table>
             </div>
         </div>
-        <div class="flex flex-wrap items-center gap-4">
-            <a href="{{ returnUrl }}" class="btn">
-                zurück
-            </a>
-            <a href="{{ path('app_administrative_questionnaire_test', { 'uuid': assignment.uuid, 'r': return_url() }) }}"
-               class="btn btn--secondary"
-               title="Den Fragebogen für diesen Einsatz ausprobieren, ohne etwas zu speichern">
-                Fragebogen testen
-            </a>
-        </div>
+        <a href="{{ returnUrl }}" class="btn">
+            zurück
+        </a>
     </div>
 {% endblock %}
diff --git a/templates/administrative/assignment/index.html.twig b/templates/administrative/assignment/index.html.twig
index 0f721b9..261b37a 100644
--- a/templates/administrative/assignment/index.html.twig
+++ b/templates/administrative/assignment/index.html.twig
@@ -207,6 +207,13 @@
                                         veröffentlichen
                                     </button>
                                 {% endif %}
+                                <a href="{{ path('app_administrative_questionnaire_test', { 'uuid': assignment.uuid, 'r': return_url() }) }}"
+                                   class="text-gray-700 hover:text-primary block px-4 py-2 text-sm"
+                                   role="menuitem"
+                                   tabindex="-1"
+                                   title="Den Fragebogen für diesen Einsatz ausprobieren, ohne etwas zu speichern">
+                                    Fragebogen testen
+                                </a>
                             </twig:DropDown>
                         </td>
                     </tr>