diff --git a/src/components/MonitorList.vue b/src/components/MonitorList.vue
index a3ead6c8..1e4fcaf4 100644
--- a/src/components/MonitorList.vue
+++ b/src/components/MonitorList.vue
@@ -89,8 +89,9 @@ export default {
 
 .list {
     &.scrollbar {
-        height: calc(100vh - 20px);
-        overflow-y: scroll;
+        min-height: calc(100vh - 240px);
+        max-height: calc(100vh - 20px);
+        overflow-y: auto;
         position: sticky;
         top: 10px;
     }
diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue
index 0cb902a7..467ae53a 100644
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@@ -40,8 +40,7 @@
         </header>
 
         <main>
-            <!-- Add :key to disable vue router re-use the same component -->
-            <router-view v-if="$root.loggedIn" :key="$route.fullPath" />
+            <router-view v-if="$root.loggedIn" />
             <Login v-if="! $root.loggedIn && $root.allowLoginDialog" />
         </main>
 
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index 1dca6b6a..b9c82e00 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -9,7 +9,8 @@
             </div>
 
             <div class="col-12 col-md-7 col-xl-8 mb-3">
-                <router-view />
+                <!-- Add :key to disable vue router re-use the same component -->
+                <router-view :key="$route.fullPath" />
             </div>
         </div>
     </div>