diff --git a/frontend/src/app/main/data/dashboard.cljs b/frontend/src/app/main/data/dashboard.cljs
index 0c38bd9b3..08d079d5f 100644
--- a/frontend/src/app/main/data/dashboard.cljs
+++ b/frontend/src/app/main/data/dashboard.cljs
@@ -60,7 +60,6 @@
 (s/def ::set-of-uuid
   (s/every ::us/uuid :kind set?))
 
-(declare clear-selected-files)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Data Fetching
@@ -149,10 +148,8 @@
 
       ptk/WatchEvent
       (watch [_ state stream]
-        (rx/concat
-          (->> (rp/query :search-files params)
-               (rx/map #(partial fetched %)))
-          (rx/of (clear-selected-files)))))))
+        (->> (rp/query :search-files params)
+             (rx/map #(partial fetched %)))))))
 
 ;; --- Fetch Files
 
@@ -164,10 +161,8 @@
     (ptk/reify ::fetch-files
       ptk/WatchEvent
       (watch [_ state stream]
-        (rx/concat
-          (->> (rp/query :files params)
-               (rx/map #(partial fetched %)))
-          (rx/of (clear-selected-files)))))))
+        (->> (rp/query :files params)
+             (rx/map #(partial fetched %)))))))
 
 ;; --- Fetch Shared Files
 
@@ -179,10 +174,8 @@
     (ptk/reify ::fetch-shared-files
       ptk/WatchEvent
       (watch [_ state stream]
-        (rx/concat
-          (->> (rp/query :shared-files {:team-id team-id})
-               (rx/map #(partial fetched %)))
-          (rx/of (clear-selected-files)))))))
+        (->> (rp/query :shared-files {:team-id team-id})
+             (rx/map #(partial fetched %)))))))
 
 ;; --- Fetch recent files
 
@@ -195,10 +188,8 @@
     ptk/WatchEvent
     (watch [_ state stream]
       (let [params {:team-id team-id}]
-        (rx/concat
-          (->> (rp/query :recent-files params)
-               (rx/map #(recent-files-fetched team-id %)))
-          (rx/of (clear-selected-files)))))))
+        (->> (rp/query :recent-files params)
+             (rx/map #(recent-files-fetched team-id %)))))))
 
 (defn recent-files-fetched
   [team-id files]
diff --git a/frontend/src/app/main/ui/dashboard/file_menu.cljs b/frontend/src/app/main/ui/dashboard/file_menu.cljs
index e1f187ed4..baff7a735 100644
--- a/frontend/src/app/main/ui/dashboard/file_menu.cljs
+++ b/frontend/src/app/main/ui/dashboard/file_menu.cljs
@@ -86,12 +86,14 @@
                         :project-id project-id}
 
                  mdata {:on-success
-                        (st/emitf (dm/success (tr "dashboard.success-move-file"))
-                                  (if navigate?
-                                    (rt/nav :dashboard-files
-                                            {:team-id team-id
-                                             :project-id project-id})
-                                    (dd/fetch-recent-files {:team-id team-id})))}]
+                        #(do
+                           (st/emit! (dm/success (tr "dashboard.success-move-file")))
+                           (if navigate?
+                             (st/emit! (rt/nav :dashboard-files
+                                               {:team-id team-id
+                                                :project-id project-id}))
+                             (st/emit! (dd/fetch-recent-files {:team-id team-id})
+                                       (dd/clear-selected-files))))}]
 
             (st/emitf (dd/move-files (with-meta data mdata))))))
 
diff --git a/frontend/src/app/main/ui/dashboard/files.cljs b/frontend/src/app/main/ui/dashboard/files.cljs
index 791724ca8..f140836cf 100644
--- a/frontend/src/app/main/ui/dashboard/files.cljs
+++ b/frontend/src/app/main/ui/dashboard/files.cljs
@@ -94,7 +94,8 @@
     (mf/use-effect
      (mf/deps (:id project))
      (fn []
-       (st/emit! (dd/fetch-files {:project-id (:id project)}))))
+       (st/emit! (dd/fetch-files {:project-id (:id project)})
+                 (dd/clear-selected-files))))
 
     [:*
      [:& header {:team team :project project}]
diff --git a/frontend/src/app/main/ui/dashboard/grid.cljs b/frontend/src/app/main/ui/dashboard/grid.cljs
index 8b4b46e52..0161b4b2d 100644
--- a/frontend/src/app/main/ui/dashboard/grid.cljs
+++ b/frontend/src/app/main/ui/dashboard/grid.cljs
@@ -321,7 +321,8 @@
 
                     mdata {:on-success
                            (st/emitf (dm/success (tr "dashboard.success-move-file"))
-                                     (dd/fetch-recent-files {:team-id team-id}))}]
+                                     (dd/fetch-recent-files {:team-id team-id})
+                                     (dd/clear-selected-files))}]
                 (st/emit! (dd/move-files (with-meta data mdata)))))))]
 
     [:section.dashboard-grid {:on-drag-enter on-drag-enter
diff --git a/frontend/src/app/main/ui/dashboard/libraries.cljs b/frontend/src/app/main/ui/dashboard/libraries.cljs
index 8f7ed8c3d..f4349600c 100644
--- a/frontend/src/app/main/ui/dashboard/libraries.cljs
+++ b/frontend/src/app/main/ui/dashboard/libraries.cljs
@@ -32,7 +32,8 @@
                        (reverse))]
     (mf/use-effect
      (mf/deps team)
-     #(st/emit! (dd/fetch-shared-files {:team-id (:id team)})))
+     #(st/emit! (dd/fetch-shared-files {:team-id (:id team)})
+                (dd/clear-selected-files)))
 
     [:*
      [:header.dashboard-header
diff --git a/frontend/src/app/main/ui/dashboard/projects.cljs b/frontend/src/app/main/ui/dashboard/projects.cljs
index 4d6a9ad62..5c30e8b10 100644
--- a/frontend/src/app/main/ui/dashboard/projects.cljs
+++ b/frontend/src/app/main/ui/dashboard/projects.cljs
@@ -162,7 +162,8 @@
     (mf/use-effect
      (mf/deps team)
      (fn []
-       (st/emit! (dd/fetch-recent-files {:team-id (:id team)}))))
+       (st/emit! (dd/fetch-recent-files {:team-id (:id team)})
+                 (dd/clear-selected-files))))
 
     (when (seq projects)
       [:*
diff --git a/frontend/src/app/main/ui/dashboard/search.cljs b/frontend/src/app/main/ui/dashboard/search.cljs
index 0360983fa..2eefa0749 100644
--- a/frontend/src/app/main/ui/dashboard/search.cljs
+++ b/frontend/src/app/main/ui/dashboard/search.cljs
@@ -29,7 +29,8 @@
     (mf/use-effect
      (mf/deps team search-term)
      (st/emitf (dd/search-files {:team-id (:id team)
-                                 :search-term search-term})))
+                                 :search-term search-term})
+               (dd/clear-selected-files)))
 
     [:*
      [:header.dashboard-header