diff --git a/app/assets/javascripts/Components/ApplicationView/ApplicationView.tsx b/app/assets/javascripts/Components/ApplicationView/ApplicationView.tsx
index 80ad7b923..967efbb9e 100644
--- a/app/assets/javascripts/Components/ApplicationView/ApplicationView.tsx
+++ b/app/assets/javascripts/Components/ApplicationView/ApplicationView.tsx
@@ -20,7 +20,7 @@ import { PremiumModalProvider } from '@/Hooks/usePremiumModal'
 import { ConfirmSignoutContainer } from '@/Components/ConfirmSignoutModal/ConfirmSignoutModal'
 import { TagsContextMenu } from '@/Components/Tags/TagContextMenu'
 import { ToastContainer } from '@standardnotes/stylekit'
-import { FilePreviewModal } from '@/Components/Files/FilePreviewModal'
+import { FilePreviewModalWrapper } from '@/Components/Files/FilePreviewModal'
 import { useCallback, useEffect, useMemo, useState } from 'preact/hooks'
 import { isStateDealloced } from '@/UIModels/AppState/AbstractState'
 import { ContentListView } from '@/Components/ContentListView/ContentListView'
@@ -236,7 +236,7 @@ export const ApplicationView: FunctionComponent<Props> = ({ application, mainApp
             application={application}
           />
           <ToastContainer />
-          <FilePreviewModal application={application} appState={appState} />
+          <FilePreviewModalWrapper application={application} appState={appState} />
         </>
       </div>
     </PremiumModalProvider>
diff --git a/app/assets/javascripts/Components/Files/FilePreviewModal.tsx b/app/assets/javascripts/Components/Files/FilePreviewModal.tsx
index a6c868810..10b621b46 100644
--- a/app/assets/javascripts/Components/Files/FilePreviewModal.tsx
+++ b/app/assets/javascripts/Components/Files/FilePreviewModal.tsx
@@ -21,10 +21,14 @@ type Props = {
   appState: AppState
 }
 
-export const FilePreviewModal: FunctionComponent<Props> = observer(({ application, appState }) => {
-  const { currentFile, setCurrentFile, otherFiles, dismiss, isOpen } = appState.filePreviewModal
+export const FilePreviewModalWrapper: FunctionComponent<Props> = observer(({ application, appState }) => {
+  return appState.filePreviewModal.isOpen ? <FilePreviewModal application={application} appState={appState} /> : null
+})
 
-  if (!currentFile || !isOpen) {
+const FilePreviewModal: FunctionComponent<Props> = observer(({ application, appState }) => {
+  const { currentFile, setCurrentFile, otherFiles, dismiss } = appState.filePreviewModal
+
+  if (!currentFile) {
     return null
   }