diff --git a/js/apps/system/aardvark/frontend/js/collections/arangoDatabase.js b/js/apps/system/aardvark/frontend/js/collections/arangoDatabase.js
index 83740bb485..498273fdb4 100644
--- a/js/apps/system/aardvark/frontend/js/collections/arangoDatabase.js
+++ b/js/apps/system/aardvark/frontend/js/collections/arangoDatabase.js
@@ -63,7 +63,14 @@
         + encodeURIComponent(name)
         + "/_admin/aardvark/index.html";
       if (hash) {
-        url += hash;
+        var base = hash.split("/")[0];
+        if (base.indexOf("#collection") === 0) {
+          base = "#collections";
+        }
+        if (base.indexOf("#application") === 0) {
+          base = "#applications";
+        }
+        url += base;
       }
       return url;
     },