diff --git a/packages/client/src/components/panels/UploadPanel/FileRow.js b/packages/client/src/components/panels/UploadPanel/FileRow.js
index a914ea4a14..28e81284f1 100644
--- a/packages/client/src/components/panels/UploadPanel/FileRow.js
+++ b/packages/client/src/components/panels/UploadPanel/FileRow.js
@@ -359,7 +359,12 @@ export default inject(
       name = splitted[0];
     }
     const { personal, theme } = auth.settingsStore;
-    const { getIconSrc, isArchive } = settingsStore;
+    const {
+      canViewedDocs,
+      isMediaOrImage,
+      getIconSrc,
+      isArchive,
+    } = settingsStore;
     const {
       uploaded,
       primaryProgressDataStore,
@@ -377,8 +382,7 @@ export default inject(
       setCurrentItem,
     } = mediaViewerDataStore;
     const { loadingFile: file } = primaryProgressDataStore;
-    const isMedia =
-      item.viewAccessability?.ImageView || item.viewAccessability?.MediaView;
+    const isMedia = isMediaOrImage(ext);
     const isMediaActive =
       playlist.findIndex((el) => el.fileId === item.fileId) !== -1;
 
@@ -391,8 +395,7 @@ export default inject(
         ? loadingFile.percent
         : null;
 
-    const downloadInCurrentTab =
-      isArchive(ext) || !item.viewAccessability?.WebView;
+    const downloadInCurrentTab = isArchive(ext) || !canViewedDocs(ext);
 
     return {
       isPersonal: personal,
diff --git a/packages/client/src/store/SettingsStore.js b/packages/client/src/store/SettingsStore.js
index be229269bf..e4f8c5ba6f 100644
--- a/packages/client/src/store/SettingsStore.js
+++ b/packages/client/src/store/SettingsStore.js
@@ -194,8 +194,22 @@ class SettingsStore {
     this.hideConfirmConvertSave = hideConfirmConvertSave;
   };
 
+  canViewedDocs = (extension) =>
+    presentInArray(this.extsWebPreviewed, extension);
+
   canConvert = (extension) => presentInArray(this.extsMustConvert, extension);
 
+  isMediaOrImage = (fileExst) => {
+    if (
+      this.extsVideo.includes(fileExst) ||
+      this.extsImage.includes(fileExst) ||
+      this.extsAudio.includes(fileExst)
+    ) {
+      return true;
+    }
+    return false;
+  };
+
   isArchive = (extension) => presentInArray(this.extsArchive, extension);
 
   isImage = (extension) => presentInArray(this.extsImage, extension);