diff --git a/frontend/src/app/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs
index a016cc2b1..4762e71d4 100644
--- a/frontend/src/app/main/ui/workspace.cljs
+++ b/frontend/src/app/main/ui/workspace.cljs
@@ -13,6 +13,7 @@
    [app.main.constants :as c]
    [app.main.data.history :as udh]
    [app.main.data.workspace :as dw]
+   [app.main.data.messages :as dm]
    [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.streams :as ms]
@@ -121,6 +122,11 @@
      (st/emit! (dw/initialize-file project-id file-id))
      (st/emitf (dw/finalize-file project-id file-id))))
 
+  (mf/use-effect
+    (fn []
+      ;; Close any non-modal dialog that may be still open
+      (st/emitf dm/hide)))
+
   (hooks/use-shortcuts dw/shortcuts)
 
   (let [file    (mf/deref refs/workspace-file)