diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index cddc8857..199bc939 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -6,7 +6,7 @@
     "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js?id=91adf6625e49f0b93731",
     "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~39825672.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~39825672.js?id=6c16b40191c43d6bd8ee",
     "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js?id=d36b3eb20b4899f2d899",
-    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~738b0c2f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~738b0c2f.js?id=ca5c3a4c0cd0b15e321d",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~738b0c2f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~738b0c2f.js?id=8013b71e5d41ca2752b8",
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~e44242d2.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~e44242d2.js?id=517790f13bf7daccdfe6",
     "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=2399d0628b27e1d915c2",
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=a80b8af62fd725c60bdb",
@@ -36,11 +36,11 @@
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1e02112873d0b86eb1ac",
     "/chunks/email-verified.js": "/chunks/email-verified.js?id=dc4aa33310fc98be6749",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=a547f8b4e9a83935a777",
-    "/chunks/files.js": "/chunks/files.js?id=5678aec50204dfafee5a",
+    "/chunks/files.js": "/chunks/files.js?id=a2e2ce2cceb678b5e0aa",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/file-browser~d426c4eb.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/file-browser~d426c4eb.js?id=c6ab649e67651e0b9f18",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~9a5728b1.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~9a5728b1.js?id=4f10f893c25e398f40bc",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~aaaa339d.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~aaaa339d.js?id=593b877c4ab874ceccfe",
-    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/trash.js?id=573076260fad9c29da73",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/trash.js?id=d7d0ba5465252023a52e",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~5df0355d.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~5df0355d.js?id=00e9511436f16aa2fb9f",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/file-browser~chunks/shared/s~b80f3c10.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/file-browser~chunks/shared/s~b80f3c10.js?id=b8f5bee79fa82cda17e2",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/file-browser~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/file-browser~chunks/trash.js?id=29e780fa7c0ba1b0621c",
@@ -49,7 +49,7 @@
     "/chunks/homepage.js": "/chunks/homepage.js?id=6f2aac612b4c6eaabf61",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=a5b0819b57321599f235",
     "/chunks/invoices.js": "/chunks/invoices.js?id=f0360ddfb0f1e1a9058b",
-    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=bc5785e11ec2e215229b",
+    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=2d6e492fe68e427dc49e",
     "/chunks/not-found.js": "/chunks/not-found.js?id=8e5c99340188c2a7b215",
     "/chunks/page-edit.js": "/chunks/page-edit.js?id=3d194f15e25dec1c54d3",
     "/chunks/pages.js": "/chunks/pages.js?id=bfd9a2e2c52e60ed025e",
@@ -59,14 +59,14 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=17469545c5b6a16c3bbf",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=0dd0a5efe0e3cb511c48",
     "/chunks/plans.js": "/chunks/plans.js?id=5a3c28288952fcad96e5",
-    "/chunks/platform.js": "/chunks/platform.js?id=acbad1d411c30999db7e",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=1d9973665b52418010a8",
+    "/chunks/platform.js": "/chunks/platform.js?id=81baa71e5044626e01ae",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=0c24fb651a0cdb9ec6cc",
     "/chunks/platform~chunks/shared/file-browser.js": "/chunks/platform~chunks/shared/file-browser.js?id=b142ad8801528b166787",
     "/chunks/platform~chunks/shared~chunks/shared/file-browser.js": "/chunks/platform~chunks/shared~chunks/shared/file-browser.js?id=6ba92eab6a45cbab3af5",
     "/chunks/profile.js": "/chunks/profile.js?id=658aa03af778cc2cc100",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=ddb7be518c092ed392ca",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=4b176796d100a2b24d71",
-    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=808b27b4d0bf98bf5ed7",
+    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=f3e4f3b1f37e034ca3ba",
     "/chunks/settings.js": "/chunks/settings.js?id=a1e5e739768b788a043a",
     "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=0656db2b76eaa0de2c58",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=29fbd676788295256ffe",
@@ -76,7 +76,7 @@
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=51b246c660e78c9263b5",
     "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=680f99e2021f19ff1af8",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=8a499266af9527039582",
-    "/chunks/shared.js": "/chunks/shared.js?id=580b344c45d867c2e48a",
+    "/chunks/shared.js": "/chunks/shared.js?id=6a28b7a8c91904501fc1",
     "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=30b0b0d1930a1952648a",
     "/chunks/shared/file-browser.js": "/chunks/shared/file-browser.js?id=02bb2b1a5518a1f73b2a",
     "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=b733dc84cd8e05a8f6f3",
@@ -86,7 +86,7 @@
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=2802cde66f7d12ec8442",
     "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=5dbfd83cfacad270a636",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=721e855dff920e5e6996",
-    "/chunks/trash.js": "/chunks/trash.js?id=16d5b490b6ca3924e977",
+    "/chunks/trash.js": "/chunks/trash.js?id=ed9ddbd70f3671a284f9",
     "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=8879f5c458f08648405a",
     "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=e365ae16373be9dbd458",
     "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=fc8183dc546683a9b60f",
@@ -121,5 +121,106 @@
     "/chunks/platform.c9b32309c60ba527110f.hot-update.js": "/chunks/platform.c9b32309c60ba527110f.hot-update.js",
     "/chunks/platform.01d8d4ea75ed639ca9b9.hot-update.js": "/chunks/platform.01d8d4ea75ed639ca9b9.hot-update.js",
     "/chunks/platform.219030356a9ea565f1ed.hot-update.js": "/chunks/platform.219030356a9ea565f1ed.hot-update.js",
-    "/chunks/platform.467805e36de85c3c98ce.hot-update.js": "/chunks/platform.467805e36de85c3c98ce.hot-update.js"
+    "/chunks/platform.467805e36de85c3c98ce.hot-update.js": "/chunks/platform.467805e36de85c3c98ce.hot-update.js",
+    "/chunks/shared.779775a105841a910850.hot-update.js": "/chunks/shared.779775a105841a910850.hot-update.js",
+    "/chunks/shared.d3b25db4279fadc665e0.hot-update.js": "/chunks/shared.d3b25db4279fadc665e0.hot-update.js",
+    "/js/main.7dbf7e231e2a95270a37.hot-update.js": "/js/main.7dbf7e231e2a95270a37.hot-update.js",
+    "/js/main.0a03413016101877488e.hot-update.js": "/js/main.0a03413016101877488e.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~860e9aef.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~860e9aef.js?id=6e023f4c39c1636ed4a7",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared/files.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared/files.js?id=dba77fc6b158bc3c2e4e",
+    "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~477ccadb.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~477ccadb.js?id=914f040c5966894873f8",
+    "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~9b5759a9.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~9b5759a9.js?id=eb26643e072aa1f2b4b5",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.js?id=4ba1c07c8eca89b549f9",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c3a97969.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c3a97969.js?id=5cda983d60a85c9168e9",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~cd83f396.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~cd83f396.js?id=f9f2e41ad11f62057c58",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f23e39b6.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f23e39b6.js?id=5216516ba11c29601c91",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.js?id=968b0922210751711d85",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js?id=42e9ee64d5c41d270832",
+    "/chunks/platform~chunks/shared/files.js": "/chunks/platform~chunks/shared/files.js?id=a1891e149640c9a838f4",
+    "/chunks/platform~chunks/shared~chunks/shared/files.js": "/chunks/platform~chunks/shared~chunks/shared/files.js?id=1ed2d41883a929aa1bc7",
+    "/chunks/shared/files.js": "/chunks/shared/files.js?id=0b7303d94c2570653312",
+    "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chun~efbe7a82.js": "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chun~efbe7a82.js?id=9af0690154c8bf6d4ef8",
+    "/js/main.d74018fe5b56d003aae4.hot-update.js": "/js/main.d74018fe5b56d003aae4.hot-update.js",
+    "/js/main.ba6f6df8b0f4192825fe.hot-update.js": "/js/main.ba6f6df8b0f4192825fe.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.ba6f6df8b0f4192825fe.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.ba6f6df8b0f4192825fe.hot-update.js",
+    "/chunks/platform~chunks/shared/files.ba6f6df8b0f4192825fe.hot-update.js": "/chunks/platform~chunks/shared/files.ba6f6df8b0f4192825fe.hot-update.js",
+    "/chunks/shared.ba6f6df8b0f4192825fe.hot-update.js": "/chunks/shared.ba6f6df8b0f4192825fe.hot-update.js",
+    "/js/main.0184165bcf798359d083.hot-update.js": "/js/main.0184165bcf798359d083.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/trash.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/trash.js?id=044735ef3156808aa39a",
+    "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=261f5a8f20b6adc93a9d",
+    "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~2aa4813a.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~2aa4813a.js?id=0965d0a56e20f1156434",
+    "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~40c7f299.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~40c7f299.js?id=d833deea841c7dd1b179",
+    "/chunks/files.0184165bcf798359d083.hot-update.js": "/chunks/files.0184165bcf798359d083.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/trash.js?id=4d342336431772666b72",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/trash~~3498a079.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/trash~~3498a079.js?id=1232855fdc787cd81f61",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/trash.js?id=8f36e803a3875619f09a",
+    "/chunks/my-shared-items.0184165bcf798359d083.hot-update.js": "/chunks/my-shared-items.0184165bcf798359d083.hot-update.js",
+    "/chunks/recent-uploads.0184165bcf798359d083.hot-update.js": "/chunks/recent-uploads.0184165bcf798359d083.hot-update.js",
+    "/chunks/trash.0184165bcf798359d083.hot-update.js": "/chunks/trash.0184165bcf798359d083.hot-update.js",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~08a18325.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~08a18325.js?id=1567289caa52553dc76d",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~1696c95e.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~1696c95e.js?id=32cddd4c6cbf30ec8833",
+    "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/trash.js": "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/trash.js?id=e45dd3c989405a0da583",
+    "/vendors~chunks/platform.js": "/vendors~chunks/platform.js?id=f745ea6dccf01ebcfaba",
+    "/js/main.c59c47afa2d6c69fecca.hot-update.js": "/js/main.c59c47afa2d6c69fecca.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings.c59c47afa2d6c69fecca.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings.c59c47afa2d6c69fecca.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared~chunks/shared/files~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared~chunks/shared/files~chunks/trash.js?id=92472c25efba01cc600a",
+    "/chunks/platform.c59c47afa2d6c69fecca.hot-update.js": "/chunks/platform.c59c47afa2d6c69fecca.hot-update.js",
+    "/chunks/shared.a8e97561e623deab2329.hot-update.js": "/chunks/shared.a8e97561e623deab2329.hot-update.js",
+    "/chunks/shared.27c8142835c18ae1c543.hot-update.js": "/chunks/shared.27c8142835c18ae1c543.hot-update.js",
+    "/js/main.9d64e001ab0a51ca10d3.hot-update.js": "/js/main.9d64e001ab0a51ca10d3.hot-update.js",
+    "/chunks/shared.b1045c0476ed3910da15.hot-update.js": "/chunks/shared.b1045c0476ed3910da15.hot-update.js",
+    "/chunks/shared.32fb7b7998a61cf32a4c.hot-update.js": "/chunks/shared.32fb7b7998a61cf32a4c.hot-update.js",
+    "/chunks/shared.ccf05df8b9febbab0af0.hot-update.js": "/chunks/shared.ccf05df8b9febbab0af0.hot-update.js",
+    "/js/main.b54140cb0b5e1d55b336.hot-update.js": "/js/main.b54140cb0b5e1d55b336.hot-update.js",
+    "/chunks/shared.b54140cb0b5e1d55b336.hot-update.js": "/chunks/shared.b54140cb0b5e1d55b336.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.012ba2b1b454e2c3df37.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.012ba2b1b454e2c3df37.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.b2ea0fc64dccc7b8c92e.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.b2ea0fc64dccc7b8c92e.hot-update.js",
+    "/chunks/shared.a3fc852026af8ad6a880.hot-update.js": "/chunks/shared.a3fc852026af8ad6a880.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.a49b6c5d179cf41c7906.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.a49b6c5d179cf41c7906.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.09bbf4b95e3a3243264e.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.09bbf4b95e3a3243264e.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.00604dd2114f9c5e2c22.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.00604dd2114f9c5e2c22.hot-update.js",
+    "/chunks/admin~chunks/platform.09d60a9840db9ec69d06.hot-update.js": "/chunks/admin~chunks/platform.09d60a9840db9ec69d06.hot-update.js",
+    "/chunks/admin~chunks/platform.2e7a49964895c6fec9d4.hot-update.js": "/chunks/admin~chunks/platform.2e7a49964895c6fec9d4.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.d172f89c1391b75ab2f4.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.d172f89c1391b75ab2f4.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.e180cf42e22511a8459d.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.e180cf42e22511a8459d.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.0e496dad22b7eef755a2.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.0e496dad22b7eef755a2.hot-update.js",
+    "/chunks/shared/single-file.0e496dad22b7eef755a2.hot-update.js": "/chunks/shared/single-file.0e496dad22b7eef755a2.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.0c3a1a6dc2e753ea95bb.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.0c3a1a6dc2e753ea95bb.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.0c3a1a6dc2e753ea95bb.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.0c3a1a6dc2e753ea95bb.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.8b1957ce73560674d255.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.8b1957ce73560674d255.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.3a5ff45452ba312310a5.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.3a5ff45452ba312310a5.hot-update.js",
+    "/chunks/shared/single-file.3a5ff45452ba312310a5.hot-update.js": "/chunks/shared/single-file.3a5ff45452ba312310a5.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.7c19d70a22c09d89340e.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.7c19d70a22c09d89340e.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.7c19d70a22c09d89340e.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.7c19d70a22c09d89340e.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.c8b722945c3eda1be2ab.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.c8b722945c3eda1be2ab.hot-update.js",
+    "/chunks/shared/single-file.c8b722945c3eda1be2ab.hot-update.js": "/chunks/shared/single-file.c8b722945c3eda1be2ab.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.db5d7513bcf0a508dd2a.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.db5d7513bcf0a508dd2a.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.db5d7513bcf0a508dd2a.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.db5d7513bcf0a508dd2a.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.d0c4dd7dda3ed02ba3f8.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.d0c4dd7dda3ed02ba3f8.hot-update.js",
+    "/chunks/shared.03b42a7e5da187553aae.hot-update.js": "/chunks/shared.03b42a7e5da187553aae.hot-update.js",
+    "/chunks/shared/files.b10cc0339a52a385a2c1.hot-update.js": "/chunks/shared/files.b10cc0339a52a385a2c1.hot-update.js",
+    "/chunks/shared/files.cb5576890820a2a0f56f.hot-update.js": "/chunks/shared/files.cb5576890820a2a0f56f.hot-update.js",
+    "/chunks/shared/files.a28c5e38208270223d37.hot-update.js": "/chunks/shared/files.a28c5e38208270223d37.hot-update.js",
+    "/chunks/shared/files.03e9e17bd5ea13e22e86.hot-update.js": "/chunks/shared/files.03e9e17bd5ea13e22e86.hot-update.js",
+    "/chunks/shared.40a606fba58f7ab53561.hot-update.js": "/chunks/shared.40a606fba58f7ab53561.hot-update.js",
+    "/chunks/shared.cb5b76677cad893d7c5c.hot-update.js": "/chunks/shared.cb5b76677cad893d7c5c.hot-update.js",
+    "/chunks/shared/files.cb5b76677cad893d7c5c.hot-update.js": "/chunks/shared/files.cb5b76677cad893d7c5c.hot-update.js",
+    "/chunks/shared/files.af6a826414ea6ed35b44.hot-update.js": "/chunks/shared/files.af6a826414ea6ed35b44.hot-update.js",
+    "/chunks/shared/files.b99a7f447841242ebabc.hot-update.js": "/chunks/shared/files.b99a7f447841242ebabc.hot-update.js",
+    "/chunks/shared/files.e8487397c3a994f61dff.hot-update.js": "/chunks/shared/files.e8487397c3a994f61dff.hot-update.js",
+    "/chunks/shared/files.87e9cf99b7463287b36d.hot-update.js": "/chunks/shared/files.87e9cf99b7463287b36d.hot-update.js",
+    "/chunks/shared/files.eaae0c9b29b02002a61b.hot-update.js": "/chunks/shared/files.eaae0c9b29b02002a61b.hot-update.js",
+    "/chunks/shared/files.8f6a57ac2e5c336548b7.hot-update.js": "/chunks/shared/files.8f6a57ac2e5c336548b7.hot-update.js",
+    "/chunks/shared/files.70a1fdc65c17afd0d500.hot-update.js": "/chunks/shared/files.70a1fdc65c17afd0d500.hot-update.js",
+    "/js/main.024304b7115df81e8cc6.hot-update.js": "/js/main.024304b7115df81e8cc6.hot-update.js",
+    "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~cac93c08.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~cac93c08.js?id=b7022941623e603f5353",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~1dbb5dcd.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~1dbb5dcd.js?id=113fc284064cb9471e29",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/single-file~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/single-file~chunks/trash.js?id=5e8878d47853806d489b",
+    "/chunks/shared/files.024304b7115df81e8cc6.hot-update.js": "/chunks/shared/files.024304b7115df81e8cc6.hot-update.js",
+    "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chun~a426b39f.js": "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chun~a426b39f.js?id=7c79cd6b6ebfc3e91a79",
+    "/js/main.dc7b5661aac044701faa.hot-update.js": "/js/main.dc7b5661aac044701faa.hot-update.js",
+    "/chunks/shared/files.dc7b5661aac044701faa.hot-update.js": "/chunks/shared/files.dc7b5661aac044701faa.hot-update.js",
+    "/chunks/shared.100980c5861ee9688aaa.hot-update.js": "/chunks/shared.100980c5861ee9688aaa.hot-update.js",
+    "/chunks/platform~chunks/shared.7fd73f76bf8aaf0abac7.hot-update.js": "/chunks/platform~chunks/shared.7fd73f76bf8aaf0abac7.hot-update.js",
+    "/chunks/shared.d7f2955e5f1062528e8f.hot-update.js": "/chunks/shared.d7f2955e5f1062528e8f.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/DesktopToolbar.vue b/resources/js/components/FilesView/DesktopToolbar.vue
index 9d32b074..441a4aa7 100644
--- a/resources/js/components/FilesView/DesktopToolbar.vue
+++ b/resources/js/components/FilesView/DesktopToolbar.vue
@@ -121,6 +121,7 @@
 				'isVisibleSidebar',
 				'FilePreviewType',
 				'currentFolder',
+				'sharedDetail',
 				'clipboard',
 			]),
 			isLoadedFolder() {
diff --git a/resources/js/components/FilesView/FileItemList.vue b/resources/js/components/FilesView/FileItemList.vue
index a2275036..a7634005 100644
--- a/resources/js/components/FilesView/FileItemList.vue
+++ b/resources/js/components/FilesView/FileItemList.vue
@@ -258,18 +258,19 @@ export default {
                 // Clear selected items after open another folder
                 this.$store.commit('CLIPBOARD_CLEAR')
 
-                if (this.$isThisLocation('public')) {
-                    this.$store.dispatch('browseShared', [{folder: this.item, back: false, init: false}])
-                } else {
-                	let route = this.$router.currentRoute.name
+				let route = this.$router.currentRoute.name
 
-					if (route === 'Files')
-						this.$router.push({name: 'Files', params: {id: this.item.id}})
-					if (route === 'Trash')
-						this.$router.push({name: 'Trash', params: {id: this.item.id}})
-					else
-						this.$router.push({name: 'Files', params: {id: this.item.id}})
-                }
+				if (route === 'Public') {
+					this.$router.push({name: 'Public', params: {token: this.$route.params.token, id: this.item.id}})
+				}
+
+				if (route === 'Trash') {
+					this.$router.push({name: 'Trash', params: {id: this.item.id}})
+				}
+
+				if (route === 'Files') {
+					this.$router.push({name: 'Files', params: {id: this.item.id}})
+				}
             }
         },
         renameItem: debounce(function (e) {
diff --git a/resources/js/routes/routesShared.js b/resources/js/routes/routesShared.js
index 2b45d8f9..798ff587 100644
--- a/resources/js/routes/routesShared.js
+++ b/resources/js/routes/routesShared.js
@@ -9,10 +9,10 @@ const routesShared = [
 		},
 		children: [
 			{
-				name: 'SharedFileBrowser',
-				path: '/share/:token/files',
+				name: 'Public',
+				path: '/share/:token/files/:id?',
 				component: () =>
-					import(/* webpackChunkName: "chunks/shared/file-browser" */ '../views/Shared/SharedFileBrowser'),
+					import(/* webpackChunkName: "chunks/shared/files" */ '../views/FileView/Public/Public'),
 				meta: {
 					requiresAuth: false
 				},
diff --git a/resources/js/store/modules/sharing.js b/resources/js/store/modules/sharing.js
index 2e1c14d2..e896eb19 100644
--- a/resources/js/store/modules/sharing.js
+++ b/resources/js/store/modules/sharing.js
@@ -1,4 +1,3 @@
-import i18n from '/resources/js/i18n/index'
 import router from '/resources/js/router'
 import {events} from '/resources/js/bus'
 import axios from 'axios'
@@ -21,26 +20,22 @@ const defaultState = {
     sharedFile: undefined,
 }
 const actions = {
-    browseShared: ({commit, getters}, [payload]) => {
+    getSharedFolder: ({commit, getters}, id) => {
         commit('LOADING_STATE', {loading: true, data: []})
 
-        payload.folder.location = 'public'
-
         return new Promise((resolve, reject) => {
             axios
-                .get(`/api/browse/folders/${payload.folder.id}/${router.currentRoute.params.token}${getters.sorting.URI}`)
+                .get(`/api/browse/folders/${id}/${router.currentRoute.params.token}${getters.sorting.URI}`)
                 .then(response => {
-                    commit('LOADING_STATE', {loading: false, data: response.data})
+                    commit('LOADING_STATE', {loading: false, data: response.data.content})
+                    commit('SET_CURRENT_FOLDER', response.data.folder)
+
                     events.$emit('scrollTop')
 
                     resolve(response)
                 })
                 .catch((error) => {
-                    // Show error message
-                    events.$emit('alert:open', {
-                        title: i18n.t('popup_error.title'),
-                        message: i18n.t('popup_error.message'),
-                    })
+                    Vue.prototype.$isSomethingWrong()
 
                     reject(error)
                 })
@@ -67,8 +62,9 @@ const actions = {
                 .catch(error => {
                     reject(error)
 
-                    if (error.response.status == 404)
+                    if (error.response.status === 404) {
                         router.push({name: 'NotFound'})
+                    }
                 })
         })
     },
@@ -102,7 +98,6 @@ const actions = {
 
                         // Flush shared data
                         commit('FLUSH_SHARED', item.id)
-
                         commit('CLIPBOARD_CLEAR')
                     })
                     resolve(true)
diff --git a/resources/js/views/FileView/Public/Public.vue b/resources/js/views/FileView/Public/Public.vue
index 507bbbcb..38547be9 100644
--- a/resources/js/views/FileView/Public/Public.vue
+++ b/resources/js/views/FileView/Public/Public.vue
@@ -147,6 +147,7 @@
 		},
 		computed: {
 			...mapGetters([
+				'sharedDetail',
 				'clipboard',
 				'user',
 			]),
@@ -205,8 +206,8 @@
 				}
 			},
 		},
-		created() {
-			this.$store.dispatch('getFolder', this.$route.params.id)
+		mounted() {
+			this.$store.dispatch('getSharedFolder', this.$route.params.id)
 
 			events.$on('context-menu:show', (event, item) => this.item = item)
 			events.$on('mobile-context-menu:show', item => this.item = item)
diff --git a/resources/js/views/Shared.vue b/resources/js/views/Shared.vue
index b50162ed..8c0b46d8 100644
--- a/resources/js/views/Shared.vue
+++ b/resources/js/views/Shared.vue
@@ -26,19 +26,23 @@
         <DragUI />
         <Alert />
 
-        <router-view :class="{'is-scaled-down': isScaledDown}" />
+		<div @contextmenu.prevent.capture="contextMenu($event, undefined)" id="file-view">
+			<DesktopToolbar/>
+			<router-view :key="$route.fullPath" />
+		</div>
     </div>
 </template>
 
 <script>
     import MultiSelectToolbar from '/resources/js/components/FilesView/MultiSelectToolbar'
+    import MobileContextMenu from '/resources/js/components/FilesView/MobileContextMenu'
     import FileSortingMobile from '/resources/js/components/FilesView/FileSortingMobile'
     import CreateFolderPopup from '/resources/js/components/Others/CreateFolderPopup'
     import ProcessingPopup from '/resources/js/components/FilesView/ProcessingPopup'
-    import MobileContextMenu from '/resources/js/components/FilesView/MobileContextMenu'
     import RenameItemPopup from '/resources/js/components/Others/RenameItemPopup'
-    import MoveItemPopup from '/resources/js/components/Others/MoveItemPopup'
     import FilePreview from '/resources/js/components/FilePreview/FilePreview'
+    import MoveItemPopup from '/resources/js/components/Others/MoveItemPopup'
+	import DesktopToolbar from "../components/FilesView/DesktopToolbar"
     import Spinner from '/resources/js/components/FilesView/Spinner'
     import Vignette from '/resources/js/components/Others/Vignette'
     import DragUI from '/resources/js/components/FilesView/DragUI'
@@ -52,9 +56,10 @@
             MultiSelectToolbar,
             CreateFolderPopup,
             FileSortingMobile,
+            MobileContextMenu,
             ProcessingPopup,
             RenameItemPopup,
-            MobileContextMenu,
+			DesktopToolbar,
             MoveItemPopup,
             FilePreview,
             Vignette,
@@ -73,6 +78,16 @@
                 isScaledDown: false
             }
         },
+		methods: {
+			spotlightListener(e) {
+				if (e.key === 'k' && e.metaKey) {
+					events.$emit('spotlight:show');
+				}
+			},
+			contextMenu(event, item) {
+				events.$emit('context-menu:show', event, item)
+			},
+		},
         mounted() {
             events.$on('mobile-menu:show', () => this.isScaledDown = true)
             events.$on('fileItem:deselect', () => this.isScaledDown = false)
@@ -81,18 +96,22 @@
                 .then(response => {
                     this.isLoading = false
 
+					let type = response.data.data.attributes.type
+					let routeName = this.$router.currentRoute.name
+					let isProtected = response.data.data.attributes.is_protected
+
                     // Show public file browser
-                    if (response.data.data.attributes.type === 'folder' && !response.data.data.attributes.is_protected && this.$router.currentRoute.name !== 'SharedFileBrowser') {
-                        this.$router.push({name: 'SharedFileBrowser'})
+                    if (type === 'folder' && !isProtected && routeName !== 'Public') {
+                        this.$router.replace({name: 'Public', params: {token: this.$route.params.token, id: response.data.data.attributes.item_id}})
                     }
 
                     // Show public single file
-                    if (response.data.data.attributes.type !== 'folder' && !response.data.data.attributes.is_protected && this.$router.currentRoute.name !== 'SharedSingleFile') {
+                    if (type !== 'folder' && !isProtected && routeName !== 'SharedSingleFile') {
                         this.$router.push({name: 'SharedSingleFile'})
                     }
 
                     // Show authentication page
-                    if (response.data.data.attributes.is_protected && this.$router.currentRoute.name !== 'SharedAuthentication') {
+                    if (isProtected && routeName !== 'SharedAuthentication') {
                         this.$router.push({name: 'SharedAuthentication'})
                     }
                 })
@@ -103,6 +122,20 @@
 <style lang="scss">
     @import '/resources/sass/vuefilemanager/_mixins';
 
+	#file-view {
+		font-family: 'Nunito', sans-serif;
+		font-size: 16px;
+		width: 100%;
+		height: 100%;
+		position: relative;
+		min-width: 320px;
+		overflow-x: hidden;
+		padding-left: 15px;
+		padding-right: 15px;
+		overflow-y: hidden;
+		@include transition(120ms);
+	}
+
     @media only screen and (max-width: 690px) {
 
         .is-scaled-down {
diff --git a/routes/api.php b/routes/api.php
index 1fdc9c99..3f8d2bd8 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -21,7 +21,7 @@ use Domain\Browsing\Controllers\BrowseLatestFilesController;
 use Domain\Browsing\Controllers\BrowseSharedItemsController;
 use Domain\Browsing\Controllers\BrowseTrashContentController;
 use Domain\Homepage\Controllers\SendContactMessageController;
-use Domain\Browsing\Controllers\BrowseFolderContentController;
+use Domain\Browsing\Controllers\BrowseFolderController;
 use Domain\Folders\Controllers\NavigationFolderTreeController;
 use Domain\Browsing\Controllers\SearchFilesAndFoldersController;
 
@@ -46,7 +46,7 @@ Route::group(['prefix' => 'password'], function () {
 Route::group(['middleware' => ['auth:sanctum']], function () {
     // Browse
     Route::group(['prefix' => 'browse'], function () {
-        Route::get('/folders/{id}', BrowseFolderContentController::class);
+        Route::get('/folders/{id}', BrowseFolderController::class);
         Route::get('/navigation', NavigationFolderTreeController::class);
         Route::get('/search', SearchFilesAndFoldersController::class);
         Route::get('/latest', BrowseLatestFilesController::class);
diff --git a/routes/share.php b/routes/share.php
index 44370e6b..3704acac 100644
--- a/routes/share.php
+++ b/routes/share.php
@@ -10,7 +10,7 @@ use Domain\Items\Controllers\VisitorMoveFileOrFolderController;
 use Domain\Items\Controllers\VisitorDeleteFileOrFolderController;
 use Domain\Items\Controllers\VisitorRenameFileOrFolderController;
 use Domain\Sharing\Controllers\VisitorUnlockLockedShareController;
-use Domain\Browsing\Controllers\VisitorBrowseFolderContentController;
+use Domain\Browsing\Controllers\VisitorBrowseFolderController;
 use Domain\Folders\Controllers\VisitorNavigationFolderTreeController;
 use Domain\Browsing\Controllers\VisitorSearchFilesAndFoldersController;
 
@@ -29,10 +29,10 @@ Route::get('/zip/{shared}', VisitorZipController::class);
 
 // Browse share content
 Route::group(['prefix' => 'browse'], function () {
-    Route::get('/folders/{id}/{shared}', VisitorBrowseFolderContentController::class);
     Route::post('/authenticate/{shared}', VisitorUnlockLockedShareController::class);
     Route::get('/navigation/{shared}', VisitorNavigationFolderTreeController::class);
     Route::get('/search/{shared}', VisitorSearchFilesAndFoldersController::class);
+    Route::get('/folders/{id}/{shared}', VisitorBrowseFolderController::class);
     Route::get('/file/{shared}', VisitorShowFileController::class);
     Route::get('/share/{share}', [ShareController::class, 'show']);
 });
diff --git a/src/Domain/Browsing/Controllers/BrowseFolderContentController.php b/src/Domain/Browsing/Controllers/BrowseFolderController.php
similarity index 96%
rename from src/Domain/Browsing/Controllers/BrowseFolderContentController.php
rename to src/Domain/Browsing/Controllers/BrowseFolderController.php
index 82c5f053..eb86cdd2 100644
--- a/src/Domain/Browsing/Controllers/BrowseFolderContentController.php
+++ b/src/Domain/Browsing/Controllers/BrowseFolderController.php
@@ -7,7 +7,7 @@ use Domain\Folders\Models\Folder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 
-class BrowseFolderContentController
+class BrowseFolderController
 {
     public function __invoke(
         Request $request,
diff --git a/src/Domain/Browsing/Controllers/VisitorBrowseFolderContentController.php b/src/Domain/Browsing/Controllers/VisitorBrowseFolderController.php
similarity index 83%
rename from src/Domain/Browsing/Controllers/VisitorBrowseFolderContentController.php
rename to src/Domain/Browsing/Controllers/VisitorBrowseFolderController.php
index d098ba7f..f25727d4 100644
--- a/src/Domain/Browsing/Controllers/VisitorBrowseFolderContentController.php
+++ b/src/Domain/Browsing/Controllers/VisitorBrowseFolderController.php
@@ -11,7 +11,7 @@ use Domain\Sharing\Actions\VerifyAccessToItemAction;
 /**
  * Browse shared folder
  */
-class VisitorBrowseFolderContentController
+class VisitorBrowseFolderController
 {
     public function __construct(
         private ProtectShareRecordAction $protectShareRecord,
@@ -22,13 +22,16 @@ class VisitorBrowseFolderContentController
     public function __invoke(
         string $id,
         Share $shared,
-    ): Collection {
+    ): array {
+
         // Check ability to access protected share record
         ($this->protectShareRecord)($shared);
 
         // Check if user can get directory
         ($this->verifyAccessToItem)($id, $shared);
 
+        $requestedFolder = Folder::findOrFail($id);
+
         // Get files and folders
         $folders = Folder::where('user_id', $shared->user_id)
             ->where('parent_id', $id)
@@ -44,7 +47,9 @@ class VisitorBrowseFolderContentController
         $files->map(fn ($file) => $file->setPublicUrl($shared->token));
 
         // Collect folders and files to single array
-        return collect([$folders, $files])
-            ->collapse();
+        return [
+            'content' => collect([$folders, $files])->collapse(),
+            'folder'  => $requestedFolder,
+        ];
     }
 }