diff --git a/dashboard/src/modules/components/LoadingComponent/index.less b/dashboard/src/modules/components/LoadingComponent/index.less
index 1aae90a949..6ed67b5d6b 100644
--- a/dashboard/src/modules/components/LoadingComponent/index.less
+++ b/dashboard/src/modules/components/LoadingComponent/index.less
@@ -1,5 +1,6 @@
 .main-page-container {
     position: relative;
+    height: 100%;
     .spinner-container {
         width: 15%;
         height: 15%;
diff --git a/dashboard/src/modules/components/TableComponent/index.jsx b/dashboard/src/modules/components/TableComponent/index.jsx
index 9ff1022efd..37d37d6ac7 100644
--- a/dashboard/src/modules/components/TableComponent/index.jsx
+++ b/dashboard/src/modules/components/TableComponent/index.jsx
@@ -235,21 +235,21 @@ const TableWithFavorite = () => {
                   )}
                 </Tbody>
               </TableComposable>
+              <TablePagination
+                numberOfRows={
+                  isSelected === "datasetListButton"
+                    ? tableData.length
+                    : favoriteRepoNames.length
+                }
+                page={page}
+                setPage={setPage}
+                perPage={perPage}
+                setPerPage={setPerPage}
+              />
             </InnerScrollContainer>
           </OuterScrollContainer>
         </div>
       </div>
-      <TablePagination
-        numberOfRows={
-          isSelected === "datasetListButton"
-            ? tableData.length
-            : favoriteRepoNames.length
-        }
-        page={page}
-        setPage={setPage}
-        perPage={perPage}
-        setPerPage={setPerPage}
-      />
     </>
   );
 };