diff --git a/app/controllers/course/dates.php b/app/controllers/course/dates.php
index 024e8dbb6b49e4f9c3757bebb973fea70ed9afaa..18df893ea13398c38c5d46aefe1bd448a7e862cf 100644
--- a/app/controllers/course/dates.php
+++ b/app/controllers/course/dates.php
@@ -45,6 +45,9 @@ class Course_DatesController extends AuthenticatedController
             } else {
                 PageLayout::postInfo(_('Thema war schon mit dem Termin verknüpft.'));
             }
+
+            $this->redirect($this->indexURL());
+            return;
         }
         Navigation::activateItem('/course/schedule/dates');
 
diff --git a/app/views/course/dates/new_topic.php b/app/views/course/dates/new_topic.php
index af4cffa64e3806dd606d06bfcf814e14e84dd5ac..7ec97f3814700badbe92f0f0d957dc6ee1fd7c84 100644
--- a/app/views/course/dates/new_topic.php
+++ b/app/views/course/dates/new_topic.php
@@ -1,3 +1,9 @@
+<?php
+/**
+ * @var Course $course
+ * @var CourseDate $date
+ */
+?>
 <form action="<?= URLHelper::getLink("dispatch.php/course/dates") ?>" method="post" id="dates_add_topic" class="default">
     <input type="hidden" name="termin_id" value="<?= $date->getId() ?>">
     <fieldset>
@@ -16,8 +22,9 @@
                     jQuery(function () {
                         jQuery("#dates_add_topic .topic_title").autocomplete({
                             'source': <?= json_encode($course->topics->pluck('title')) ?>,
-                            'select': function () {
-                                jQuery("form#dates_add_topic").submit();
+                            'select': function (event, { item }) {
+                                $(this).val(item.value);
+                                jQuery("#dates_add_topic").trigger('submit');
                             }
                         });
                     });