diff --git a/modules/doc/application/views/scripts/index/index.phtml b/modules/doc/application/views/scripts/index/index.phtml
index 9edb5910d..4381bc2a0 100644
--- a/modules/doc/application/views/scripts/index/index.phtml
+++ b/modules/doc/application/views/scripts/index/index.phtml
@@ -1,5 +1,5 @@
 <h1>Available documentations</h1>
 <ul>
-  <li><a href="<?= $this->href('doc/icingaweb'); ?>">Icinga Web 2</a></li>
+  <li><a href="<?= $this->href('doc/icingaweb/toc'); ?>">Icinga Web 2</a></li>
   <li><a href="<?= $this->href('doc/module/'); ?>">Module documentations</a></li>
 </ul>
diff --git a/modules/doc/application/views/scripts/module/index.phtml b/modules/doc/application/views/scripts/module/index.phtml
index 5e9eaae9d..bbd74345a 100644
--- a/modules/doc/application/views/scripts/module/index.phtml
+++ b/modules/doc/application/views/scripts/module/index.phtml
@@ -1,6 +1,10 @@
 <h1>Module documentations</h1>
 <ul>
 <?php foreach ($enabledModules as $module): ?>
-  <li><a href="<?= $this->href('doc/module/' . $module); ?>"><?= $module ?></a></li>
+  <li>
+    <a href="<?= $this->getHelper('Url')->url(array('moduleName' => $module), 'doc/module/toc', false, false); ?>">
+      <?= $module ?>
+    </a>
+  </li>
 <?php endforeach ?>
 </ul>