diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index c49f5f3a7..9a65711bd 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -8,9 +8,9 @@
                 <MonitorList :scrollbar="true" />
             </div>
 
-            <div class="col-12 col-md-7 col-xl-8 mb-3">
+            <div ref="container" class="col-12 col-md-7 col-xl-8 mb-3">
                 <!-- Add :key to disable vue router re-use the same component -->
-                <router-view :key="$route.fullPath" />
+                <router-view :key="$route.fullPath" :calculatedHeight="height" />
             </div>
         </div>
     </div>
@@ -25,7 +25,12 @@ export default {
         MonitorList,
     },
     data() {
-        return {};
+        return {
+            height: 0
+        };
+    },
+    mounted() {
+        this.height = this.$refs.container.offsetHeight;
     },
 };
 </script>
diff --git a/src/pages/DashboardHome.vue b/src/pages/DashboardHome.vue
index 2745d91bc..0be4555a7 100644
--- a/src/pages/DashboardHome.vue
+++ b/src/pages/DashboardHome.vue
@@ -1,5 +1,5 @@
 <template>
-    <transition name="slide-fade" appear>
+    <transition ref="tableContainer" name="slide-fade" appear>
         <div v-if="$route.name === 'DashboardHome'">
             <h1 class="mb-3">
                 {{ $t("Quick Stats") }}
@@ -81,10 +81,17 @@ export default {
         Status,
         Pagination,
     },
+    props: {
+        calculatedHeight: {
+            type: Number,
+            default: 0
+        }
+    },
     data() {
         return {
             page: 1,
             perPage: 25,
+            initialPerPage: 25,
             heartBeatList: [],
             paginationConfig: {
                 hideCount: true,
@@ -134,6 +141,37 @@ export default {
             return this.heartBeatList.slice(startIndex, endIndex);
         },
     },
+    watch: {
+        importantHeartBeatList() {
+            this.$nextTick(() => {
+                this.updatePerPage();
+            });
+        },
+    },
+    mounted() {
+        this.initialPerPage = this.perPage;
+
+        window.addEventListener("resize", this.updatePerPage);
+        this.updatePerPage();
+    },
+    beforeUnmount() {
+        window.removeEventListener("resize", this.updatePerPage);
+    },
+    methods: {
+        updatePerPage() {
+            const tableContainer = this.$refs.tableContainer;
+            const tableContainerHeight = tableContainer.offsetHeight;
+            const availableHeight = window.innerHeight - tableContainerHeight;
+            const additionalPerPage = Math.floor(availableHeight / 58);
+
+            if (additionalPerPage > 0) {
+                this.perPage = Math.max(this.initialPerPage, this.perPage + additionalPerPage);
+            } else {
+                this.perPage = this.initialPerPage;
+            }
+
+        },
+    },
 };
 </script>