diff --git a/frontend/src/app/main/data/dashboard.cljs b/frontend/src/app/main/data/dashboard.cljs
index 86352517bd..165cd178c8 100644
--- a/frontend/src/app/main/data/dashboard.cljs
+++ b/frontend/src/app/main/data/dashboard.cljs
@@ -17,6 +17,7 @@
    [app.main.data.users :as du]
    [app.main.features :as features]
    [app.main.repo :as rp]
+   [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [tr]]
    [app.util.router :as rt]
    [app.util.timers :as tm]
@@ -999,8 +1000,10 @@
      (watch [_ state _]
        (let [team-id (:current-team-id state)]
          (if (empty? term)
-           (rx/of (rt/nav :dashboard-search
-                          {:team-id team-id}))
+           (do
+              (dom/focus! (dom/get-element "search-input"))
+              (rx/of (rt/nav :dashboard-search
+                              {:team-id team-id})))
            (rx/of (rt/nav :dashboard-search
                           {:team-id team-id}
                           {:search-term term}))))))))