diff --git a/src/main/frontend/handler/events/ui.cljs b/src/main/frontend/handler/events/ui.cljs
index 73d51c14e5..7205b22f2c 100644
--- a/src/main/frontend/handler/events/ui.cljs
+++ b/src/main/frontend/handler/events/ui.cljs
@@ -91,7 +91,7 @@
 (defmethod events/handle :redirect-to-home [_]
   (page-handler/create-today-journal!)
   (when (util/capacitor?)
-    (mobile-state/redirect-to-tab! "home")))
+    (mobile-state/set-tab! "home")))
 
 (defmethod events/handle :page/show-delete-dialog [[_ selected-rows ok-handler]]
   (shui/dialog-open!
diff --git a/src/main/mobile/bottom_tabs.cljs b/src/main/mobile/bottom_tabs.cljs
index 3f2e94257f..368cc4998f 100644
--- a/src/main/mobile/bottom_tabs.cljs
+++ b/src/main/mobile/bottom_tabs.cljs
@@ -77,6 +77,9 @@
          ;;   (state/pub-event! [:mobile/start-audio-record])
          ;;   (editor-handler/show-quick-add))
          nil)))
+    (add-watch mobile-state/*tab ::select-tab
+               (fn [_ _ old new]
+                 (when new (select! new))))
     (add-search-listener!
      (fn [q]
       ;; wire up search handler
diff --git a/src/main/mobile/components/header.cljs b/src/main/mobile/components/header.cljs
index 185ec29fe5..ec86738f29 100644
--- a/src/main/mobile/components/header.cljs
+++ b/src/main/mobile/components/header.cljs
@@ -144,7 +144,7 @@
                            (page-handler/<delete!
                             (fn []
                               ;; FIXME: empty screen, wrong route state
-                              (mobile-state/redirect-to-tab! "home"))
+                              (mobile-state/set-tab! "home"))
                             {:error-handler
                              (fn [{:keys [msg]}]
                                (notification/show! msg :warning))})))))}
diff --git a/src/main/mobile/components/popup.cljs b/src/main/mobile/components/popup.cljs
index 73a6c91c93..24c829a2e0 100644
--- a/src/main/mobile/components/popup.cljs
+++ b/src/main/mobile/components/popup.cljs
@@ -6,6 +6,7 @@
             [frontend.ui :as ui]
             [logseq.shui.popup.core :as shui-popup]
             [logseq.shui.ui :as shui]
+            [mobile.bottom-tabs :as bottom-tabs]
             [mobile.state :as mobile-state]
             [rum.core :as rum]))
 
@@ -105,7 +106,7 @@
     (= :download-rtc-graph (first args))
     (do
       (dismiss-native-sheet!)
-      (mobile-state/redirect-to-tab! "home"))
+      (mobile-state/set-tab! "home"))
 
     :else
     (if (and @*last-popup-modal? (not (= (first args) :editor.commands/commands)))
diff --git a/src/main/mobile/core.cljs b/src/main/mobile/core.cljs
index 8d85752e37..e6fd5aa643 100644
--- a/src/main/mobile/core.cljs
+++ b/src/main/mobile/core.cljs
@@ -68,7 +68,7 @@
                                          :skip-refresh? true})))))
 
            :graphs
-           (mobile-state/redirect-to-tab! "settings")
+           (mobile-state/set-tab! "settings")
 
            :import
            (shui/popup-show! nil (fn []
diff --git a/src/main/mobile/deeplink.cljs b/src/main/mobile/deeplink.cljs
index 7606149768..3d9dc3c8a0 100644
--- a/src/main/mobile/deeplink.cljs
+++ b/src/main/mobile/deeplink.cljs
@@ -39,9 +39,6 @@
       (state/pub-event! [:mobile/start-audio-record])
       (and (= hostname "mobile") (= pathname "/go/quick-add"))
       (editor-handler/show-quick-add)
-      (and (= hostname "mobile")
-           (contains? #{"/go/favorites"} pathname))
-      (mobile-state/redirect-to-tab! "favorites")
       (= hostname "graph")
       (let [graph-name (some-> pathname
                                (string/replace "/" "")
diff --git a/src/main/mobile/state.cljs b/src/main/mobile/state.cljs
index c53f959b57..38c7bcb93a 100644
--- a/src/main/mobile/state.cljs
+++ b/src/main/mobile/state.cljs
@@ -24,9 +24,6 @@
   []
   (= :ls-quick-add (get-in @*popup-data [:opts :id])))
 
-(defn redirect-to-tab! [name]
-  (set-tab! (str name)))
-
 (defonce *log (atom []))
 (defn log-append!
   [record]