diff --git a/angular.json b/angular.json
index 4b62c771cb..cdf213e39d 100644
--- a/angular.json
+++ b/angular.json
@@ -142,7 +142,15 @@
             "configDir": ".storybook",
             "browserTarget": "components:build",
             "compodoc": true,
-            "compodocArgs": ["-p", "./tsconfig.json", "-e", "json", "-d", "."],
+            "compodocArgs": [
+              "-p",
+              "./tsconfig.json",
+              "-e",
+              "json",
+              "-d",
+              ".",
+              "--disableRoutesGraph"
+            ],
             "port": 6006
           }
         },
diff --git a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
index 77530d06e5..28692c79e1 100644
--- a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
+++ b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
@@ -315,13 +315,13 @@ export default {
         importProvidersFrom(
           RouterModule.forRoot(
             [
-              { path: "", redirectTo: "vault", pathMatch: "full" },
-              { path: "vault", component: MockVaultPageComponent },
-              { path: "generator", component: MockGeneratorPageComponent },
-              { path: "send", component: MockSendPageComponent },
-              { path: "settings", component: MockSettingsPageComponent },
+              { path: "", redirectTo: "tabs/vault", pathMatch: "full" },
+              { path: "tabs/vault", component: MockVaultPageComponent },
+              { path: "tabs/generator", component: MockGeneratorPageComponent },
+              { path: "tabs/send", component: MockSendPageComponent },
+              { path: "tabs/settings", component: MockSettingsPageComponent },
               // in case you are coming from a story that also uses the router
-              { path: "**", redirectTo: "vault" },
+              { path: "**", redirectTo: "tabs/vault" },
             ],
             { useHash: true },
           ),