diff --git a/client/src/entry/analysis/menu.js b/client/src/entry/analysis/menu.js
index 29ed49424a7b..75a5190cf4fb 100644
--- a/client/src/entry/analysis/menu.js
+++ b/client/src/entry/analysis/menu.js
@@ -53,7 +53,6 @@ export function fetchMenu(options = {}) {
                 {
                     title: _l("Data Libraries"),
                     url: "/libraries",
-                    target: "_top",
                 },
                 {
                     title: _l("Datasets"),
@@ -91,7 +90,6 @@ export function fetchMenu(options = {}) {
                 {
                     title: _l("Data Libraries"),
                     url: "/libraries",
-                    target: "_top",
                 },
                 {
                     title: _l("Histories"),
@@ -123,7 +121,6 @@ export function fetchMenu(options = {}) {
             url: "/admin",
             tooltip: _l("Administer this Galaxy"),
             cls: "admin-only",
-            target: "_top",
         });
     }
 
diff --git a/client/src/entry/analysis/modules/Base.vue b/client/src/entry/analysis/modules/Base.vue
index 0d9d8c822122..9abb973c30ef 100644
--- a/client/src/entry/analysis/modules/Base.vue
+++ b/client/src/entry/analysis/modules/Base.vue
@@ -1,3 +1,3 @@
 <template>
-    <router-view :key="$route.fullPath" class="m-2" />
+    <router-view :key="$route.fullPath" />
 </template>
diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
index 43f7e851848f..2621b858aacd 100644
--- a/client/src/entry/analysis/router.js
+++ b/client/src/entry/analysis/router.js
@@ -105,9 +105,6 @@ export function getRouter(Galaxy) {
         base: getAppRoot(),
         mode: "history",
         routes: [
-            ...AdminRoutes,
-            ...LibraryRoutes,
-            ...StorageDashboardRoutes,
             /** Login entry route */
             {
                 path: "/login/start",
@@ -171,6 +168,9 @@ export function getRouter(Galaxy) {
                 path: "/",
                 component: Analysis,
                 children: [
+                    ...AdminRoutes,
+                    ...LibraryRoutes,
+                    ...StorageDashboardRoutes,
                     {
                         path: "",
                         alias: "root",