diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index eb14b871..ba311da0 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,7 +1,7 @@
 {
     "/js/main.js": "/js/main.js",
     "/chunks/request.js": "/chunks/request.js?id=e12cca6ff4d753a0",
-    "/chunks/request-upload.js": "/chunks/request-upload.js?id=6162439c4476a9fb",
+    "/chunks/request-upload.js": "/chunks/request-upload.js?id=6f7ff06d99abc1db",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=e8b9ac5e5a0854bf",
     "/chunks/status-check.js": "/chunks/status-check.js?id=4c7482ca1bc4806d",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=95910a6098545b18",
@@ -10,7 +10,7 @@
     "/chunks/app-setup.js": "/chunks/app-setup.js?id=fac96a371fa057a9",
     "/chunks/admin-account.js": "/chunks/admin-account.js?id=f207f8887394310d",
     "/chunks/shared.js": "/chunks/shared.js?id=cdfbac570212aaba",
-    "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=eb7d18bbc0ac131a",
+    "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=82de4b533b350338",
     "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=fda3ee1897218fb4",
     "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=a68c497e91a6fadb",
     "/chunks/not-found.js": "/chunks/not-found.js?id=cbcb2fcb42696af3",
@@ -63,12 +63,12 @@
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=e6866a6ffd9c3a80",
     "/chunks/billing.js": "/chunks/billing.js?id=ce81cf6583d26d4c",
     "/chunks/platform.js": "/chunks/platform.js?id=8899666aebaf9db4",
-    "/chunks/files.js": "/chunks/files.js?id=5f981e4f05062e30",
-    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=3469cce1ee71c03c",
-    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=2f712e064ac8e575",
-    "/chunks/trash.js": "/chunks/trash.js?id=2df58d71ed9f7ea2",
-    "/chunks/team-folders.js": "/chunks/team-folders.js?id=7bda1a54e372f0de",
-    "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=f8eec4a942b431a0",
+    "/chunks/files.js": "/chunks/files.js?id=a6dbd9f43e4eb694",
+    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=8f087976e1d1af41",
+    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=969ac9f4297e1179",
+    "/chunks/trash.js": "/chunks/trash.js?id=da9791f0f6155a99",
+    "/chunks/team-folders.js": "/chunks/team-folders.js?id=88bce3b12b4dce95",
+    "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=45b03e5063720b33",
     "/chunks/invitation.js": "/chunks/invitation.js?id=3220065b746aa8fe",
     "/css/tailwind.css": "/css/tailwind.css",
     "/css/app.css": "/css/app.css"
diff --git a/resources/js/components/FilesView/FileBrowser.vue b/resources/js/components/FilesView/FileBrowser.vue
index 14c451af..515e887c 100644
--- a/resources/js/components/FilesView/FileBrowser.vue
+++ b/resources/js/components/FilesView/FileBrowser.vue
@@ -65,7 +65,7 @@ export default {
                 return  this.paginate.paginate.currentPage !== this.paginate.paginate.lastPage
         },
         showInfiniteLoadSpinner() {
-            return this.continueInfiniteScroll && this.entries.length !== 0 && config.itemsPerPage <= this.entries.length
+            return this.continueInfiniteScroll && this.entries.length !== 0 && this.paginate.paginate.perPage <= this.entries.length
         },
     },
     data() {
@@ -90,7 +90,7 @@ export default {
             }
         },
         elementInViewport() {
-            var item =  document.getElementById('infinite-loader')
+            var item = document.getElementById('infinite-loader')
             var rect = item.getBoundingClientRect()
 
             return (
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index d4ede93f..a9a93617 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -180,7 +180,6 @@
             // App settings
 			userRegistration: {{ $settings->registration ?? 1 }},
 			userVerification: {{ $settings->user_verification ?? 0 }},
-            itemsPerPage:     {{ config('vuefilemanager.paginate.perPage') }},
         }
     </script>
 
diff --git a/src/Support/helpers.php b/src/Support/helpers.php
index 56263598..23152911 100644
--- a/src/Support/helpers.php
+++ b/src/Support/helpers.php
@@ -1163,7 +1163,7 @@ if (! function_exists('replace_occurrence')) {
         ) : array {
 
             $perPage = config('vuefilemanager.paginate.perPage');
-            $currentPage = $request->get('page');
+            $currentPage = $request->get('page') === 'all' ? 1 : (int)$request->get('page');
 
               // Collect Folders with Files
             $entries = collect([
@@ -1171,8 +1171,13 @@ if (! function_exists('replace_occurrence')) {
                 $files   ? json_decode((new FilesCollection($files))->toJson(), true) : null,
             ])->collapse();
 
-            // Paginate grouped Folders and Files
-            $groupPaginate = $entries->forPage($currentPage, $perPage)->values();
+            if($request->input('page') === 'all') {
+                // If is page set to 'all' return all records
+                $groupPaginate = $entries;
+            } else {
+                // Paginate grouped Folders and Files
+                $groupPaginate = $entries->forPage($currentPage, $perPage)->values();
+            }
 
             $uri = $request->fullUrl();
 
@@ -1181,7 +1186,7 @@ if (! function_exists('replace_occurrence')) {
             return [
                 $groupPaginate, 
                 [
-                    'currentPage'   => (int)$currentPage,
+                    'currentPage'   => $currentPage,
                     'from'          => 1,
                     'lastPage'      => $lastPage,
                     'path'          => $uri,