diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index d1f32041..256f0635 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=0af05c27cd2a923d",
-    "/chunks/request-upload.js": "/chunks/request-upload.js?id=4185c583092afa25",
+    "/chunks/request.js": "/chunks/request.js?id=e7060a440fcd8d12",
+    "/chunks/request-upload.js": "/chunks/request-upload.js?id=ad59a7b445c3e211",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
     "/chunks/status-check.js": "/chunks/status-check.js?id=87d72b50e83864bb",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=df5bd89528649783",
@@ -9,13 +9,13 @@
     "/chunks/environment.js": "/chunks/environment.js?id=ab5382f4452a258a",
     "/chunks/app-setup.js": "/chunks/app-setup.js?id=288594cd7f628cf8",
     "/chunks/admin-account.js": "/chunks/admin-account.js?id=916450217130f3b8",
-    "/chunks/shared.js": "/chunks/shared.js?id=036d97c0534d7f51",
-    "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=38ef8c97b11c9c2d",
+    "/chunks/shared.js": "/chunks/shared.js?id=d988ff3a8c3443dd",
+    "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=ad41dcffe2d7f637",
     "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=b561af60bcd5be2b",
     "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=672e931a9fb0b672",
     "/chunks/not-found.js": "/chunks/not-found.js?id=9f6ce23ce5d969f1",
     "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=f564565faa09d6d6",
-    "/chunks/admin.js": "/chunks/admin.js?id=c94163e0c94b811c",
+    "/chunks/admin.js": "/chunks/admin.js?id=88646f72ae64fc9c",
     "/chunks/dashboard.js": "/chunks/dashboard.js?id=fd1d266e493a79a8",
     "/chunks/invoices.js": "/chunks/invoices.js?id=1416cbf6d1a593ac",
     "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5bf6704f5b599f36",
@@ -38,7 +38,7 @@
     "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=1ad77372d342326f",
     "/chunks/payments.js": "/chunks/payments.js?id=dc4586691c25de6f",
     "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=dd6c9d6a29a47808",
-    "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=ea498b4bac742dae",
+    "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=22bce2575affd7af",
     "/chunks/app-settings.js": "/chunks/app-settings.js?id=55da23af2b076069",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=a694a01f3641712c",
     "/chunks/app-index.js": "/chunks/app-index.js?id=efdbfa062749ca00",
@@ -57,18 +57,18 @@
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=bb92bad614e60d45",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=50a1bc5e4ed86ec9",
     "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=f652de052dba55c1",
-    "/chunks/settings.js": "/chunks/settings.js?id=7f300286a54df85c",
+    "/chunks/settings.js": "/chunks/settings.js?id=ec9eeb1e963303db",
     "/chunks/profile.js": "/chunks/profile.js?id=0eca231475e267ab",
     "/chunks/settings-password.js": "/chunks/settings-password.js?id=11d4331650cac280",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=994b669a56fd417b",
     "/chunks/billing.js": "/chunks/billing.js?id=40e758c87bcf6e89",
-    "/chunks/platform.js": "/chunks/platform.js?id=786df99c955c6781",
-    "/chunks/files.js": "/chunks/files.js?id=954d9679ec19a00e",
-    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=fc682388bfb0e363",
-    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=4cfda69a55d4dd7f",
-    "/chunks/trash.js": "/chunks/trash.js?id=ed1da867bfff2c4c",
-    "/chunks/team-folders.js": "/chunks/team-folders.js?id=0b7f74e182d4875b",
-    "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=bed8ea17c597a20a",
+    "/chunks/platform.js": "/chunks/platform.js?id=a4e3656f8b9c5eed",
+    "/chunks/files.js": "/chunks/files.js?id=428bd060f0a47a83",
+    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=b6d65115d006dba9",
+    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=afb56eefb86ca3ec",
+    "/chunks/trash.js": "/chunks/trash.js?id=545762e25b76103f",
+    "/chunks/team-folders.js": "/chunks/team-folders.js?id=63558b5c579d5060",
+    "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=63623abd64ec93e7",
     "/chunks/invitation.js": "/chunks/invitation.js?id=9ed8456c9d6d5ce1",
     "/css/tailwind.css": "/css/tailwind.css",
     "/css/app.css": "/css/app.css"
diff --git a/resources/js/components/FilePreview/FilePreviewMedia.vue b/resources/js/components/FilePreview/FilePreviewMedia.vue
index d31c8562..5fbbfb5e 100644
--- a/resources/js/components/FilePreview/FilePreviewMedia.vue
+++ b/resources/js/components/FilePreview/FilePreviewMedia.vue
@@ -13,7 +13,7 @@
 
         <!--Desktop preview-->
         <div
-            v-if="!$isMobile() && (isAudio || isImage || isVideo || isPDF)"
+            v-if="(!$isMobile() || fastPreview) && (isAudio || isImage || isVideo || isPDF)"
             class="flex h-full w-full items-center justify-center"
         >
             <!--Show PDF-->
@@ -29,7 +29,7 @@
 
         <!--Mobile Preview-->
         <div
-            v-if="$isMobile() && (isAudio || isImage || isVideo || isPDF)"
+            v-if="($isMobile() && !fastPreview) && (isAudio || isImage || isVideo || isPDF)"
             @scroll="checkGroupInView"
             id="group-box"
             ref="scrollBox"
@@ -170,8 +170,6 @@ export default {
         events.$on('file-preview:next', () => this.next())
         events.$on('file-preview:prev', () => this.prev())
 
-        this.getFilesForView()
-
 		events.$on('file:deleted', id => {
 			this.files = this.files.filter(item => item.data.id !== id)
 
@@ -181,6 +179,10 @@ export default {
 				this.$store.commit('CLIPBOARD_REPLACE', this.currentFile)
 			}
 		})
+
+		if (! this.fastPreview) {
+			this.getFilesForView()
+		}
     },
 	destroyed() {
 		events.$off('file:deleted')
diff --git a/resources/js/components/FilesView/ItemList.vue b/resources/js/components/FilesView/ItemList.vue
index 7abdb96a..c2bb898d 100644
--- a/resources/js/components/FilesView/ItemList.vue
+++ b/resources/js/components/FilesView/ItemList.vue
@@ -219,9 +219,6 @@ export default {
         }, 300),
     },
     created() {
-        // Set item name to own component variable
-        this.itemName = this.entry.data.attributes.name
-
         // Change item name
         events.$on('change:name', (item) => {
             if (this.entry.data.id === item.id) {
@@ -237,7 +234,12 @@ export default {
             }
         })
 
-		this.getImageSrc()
+		// Set item name to own component variable
+		this.itemName = this.entry.data.attributes.name
+
+		if (this.entry.data.type === 'image') {
+			this.getImageSrc()
+		}
 	},
 }
 </script>