diff --git a/TandemPlugin.class.php b/TandemPlugin.class.php
index 46078d278dbbc2829d327b93a2614db92ef5afef..2cd714f2267d45be8f6746f7449fc8b12a03e453 100644
--- a/TandemPlugin.class.php
+++ b/TandemPlugin.class.php
@@ -29,6 +29,12 @@ class TandemPlugin extends StudIPPlugin implements SystemPlugin, PortalPlugin
     }
 
 
+    public function isOldStudip()
+    {
+        return version_compare($GLOBALS['SOFTWARE_VERSION'], '5.0', '<');
+    }
+
+
     public function __construct()
     {
         parent::__construct();
@@ -98,9 +104,15 @@ class TandemPlugin extends StudIPPlugin implements SystemPlugin, PortalPlugin
             $top_navigation = null;
             $navigation_name = 'admin';
             if (Config::get()->TANDEMPLUGIN_USE_TOOLS_NAVIGATION) {
-                if (Navigation::hasItem('/tools')) {
+                if (Navigation::hasItem('/tools') && $this->isOldStudip()) {
                     $top_navigation = Navigation::getItem('/tools');
                     $navigation_name = 'tandemplugin';
+                } elseif (Navigation::hasItem('/contents')) {
+                    $top_navigation = Navigation::getItem('/contents');
+                    $navigation_name = 'tandemplugin';
+                    $navigation->setImage(
+                        Icon::create("roles", "navigation")
+                    );
                 }
             } else {
                 $top_navigation = clone $navigation;
diff --git a/controllers/admin.php b/controllers/admin.php
index d9b719063f2b73ee8c0fed4fe6af5471693d9c1e..4e2872a9a6ebc887973f6a526daf11906b19ba19 100644
--- a/controllers/admin.php
+++ b/controllers/admin.php
@@ -33,7 +33,11 @@ class AdminController extends PluginController
 
         $this->admin_nav_path = '/tandemplugin/admin';
         if (Config::get()->TANDEMPLUGIN_USE_TOOLS_NAVIGATION) {
-            $this->admin_nav_path = '/tools/tandemplugin';
+            if ($this->plugin->isOldStudip()) {
+                $this->admin_nav_path = '/tools/tandemplugin';
+            } else {
+                $this->admin_nav_path = '/contents/tandemplugin';
+            }
         }
     }
 
diff --git a/plugin.manifest b/plugin.manifest
index 3694670cf7fec9903fc06e336cc56949b5fc7900..ebf201eec760582e15b1a0d32c49bb268b8bfc62 100644
--- a/plugin.manifest
+++ b/plugin.manifest
@@ -1,7 +1,7 @@
 pluginname=TandemPlugin
 pluginclassname=TandemPlugin
 origin=data-quest
-version=1.1.0
+version=1.1.1
 description=Dieses Plugin ermöglicht es, Sprachtandems innerhalb der Stud.IP Platform zu bilden.
 studipMinVersion=4.0
 studipMaxVersion=5.9.99