diff --git a/app/controllers/module/module.php b/app/controllers/module/module.php
index 854b04536102f9b860a9c39a708b0e7830e273f9..10674d07dc916d8ded6d027efa57f00cc72bdf0d 100644
--- a/app/controllers/module/module.php
+++ b/app/controllers/module/module.php
@@ -101,6 +101,7 @@ class Module_ModuleController extends MVVController
         $this->count = Modul::getCount($this->filter);
         $this->show_sidebar_search = true;
         $this->show_sidebar_filter = true;
+        $this->modul_id = Request::option('modul_id');
         $this->setSidebar();
     }
 
@@ -323,7 +324,7 @@ class Module_ModuleController extends MVVController
                         $success_message,
                         htmlReady($this->modul->getDisplayName())
                     ));
-                    $this->redirect($this->indexURL());
+                    $this->redirect($this->indexURL(['modul_id' => $this->modul->id]) . "#modul_{$this->modul->id}");
                     return;
                 }
             }
diff --git a/app/views/module/module/module.php b/app/views/module/module/module.php
index 271e3f9d43224f14e7e87dca452c2d725e62aedb..d6cda88fdf11408f1d35b1f38ae29a65cde35388 100644
--- a/app/views/module/module/module.php
+++ b/app/views/module/module/module.php
@@ -1,9 +1,9 @@
 <? foreach ($module as $modul) : ?>
     <? $perm = MvvPerm::get($modul) ?>
-    <tbody class="<?= ($modul->count_modulteile ? '' : 'empty ') ?><?= ($modul_id === $modul->getId() ? 'not-collapsed' : 'collapsed') ?>">
+    <tbody class="<?= $modul->count_modulteile ? '' : 'empty ' ?><?= $modul_id === $modul->getId() ? 'not-collapsed' : 'collapsed' ?>">
         <? $ampel_icon = $GLOBALS['MVV_STUDIENGANG']['STATUS']['values'][$modul->stat]['icon'] ?>
         <? $ampelstatus = $GLOBALS['MVV_STUDIENGANG']['STATUS']['values'][$modul->stat]['name'] ?>
-        <tr class="header-row" id="modul_<?= $modul->getId() ?>">
+        <tr class="header-row <?= $modul_id === $modul->getId() ? 'selected' : '' ?>" id="modul_<?= $modul->getId() ?>">
             <? if ($modul->count_modulteile) : ?>
                 <td style="white-space:nowrap;" class="toggle-indicator">
                     <? $details_action = $details_action ?? 'details'; ?>