diff --git a/app/controllers/course/contentmodules.php b/app/controllers/course/contentmodules.php
index 04eb8464ddebdcb79ddcebf8812c12e8de794191..7a54ee1c3b4c4130e86d3088ad04d142ed1ba696 100644
--- a/app/controllers/course/contentmodules.php
+++ b/app/controllers/course/contentmodules.php
@@ -125,8 +125,10 @@ class Course_ContentmodulesController extends AuthenticatedController
                     $active_tool->store();
                 }
             }
-            //$this->redirect("course/contentmodules/trigger", ['cid' => $context->getId()]);
+            $this->redirect("course/contentmodules/trigger", ['cid' => $context->getId(), 'plugin_id' => $module->getPluginId()]);
+            return;
         }
+        $active_tool = ToolActivation::find([$context->id, Request::int('plugin_id')]);
         $template = $GLOBALS['template_factory']->open('tabs.php');
         $template->navigation = Navigation::getItem('/course');
         Navigation::getItem('/course/admin')->setActive(true);