diff --git a/src/status_im/navigation/core.cljs b/src/status_im/navigation/core.cljs
index 6099d6af0f..a0e9367f51 100644
--- a/src/status_im/navigation/core.cljs
+++ b/src/status_im/navigation/core.cljs
@@ -37,14 +37,14 @@
 
   (navigation/reg-component-did-appear-listener
    (fn [view-id]
-     (when (get views/screens view-id)
-       ;;NOTE when back from the background on Android, this event happens for all screens, but we
-       ;;need only for active one
-       (when (and @state/curr-modal (= @state/curr-modal view-id))
-         (effects/set-view-id view-id))
-       (when-not @state/curr-modal
+     (let [view-id-with-prefix (keyword (str "screen/" (name view-id)))
+           view                (or (get views/screens view-id)
+                                   (get views/screens view-id-with-prefix))
+           view-id             (:name view)]
+       (when view
          (effects/set-view-id view-id)
-         (reset! state/pushed-screen-id view-id)))))
+         (when-not @state/curr-modal
+           (reset! state/pushed-screen-id view-id))))))
 
   ;;;; Modal
 
diff --git a/src/status_im/navigation/events.cljs b/src/status_im/navigation/events.cljs
index f2806d3ef3..0b7a5514a4 100644
--- a/src/status_im/navigation/events.cljs
+++ b/src/status_im/navigation/events.cljs
@@ -33,7 +33,9 @@
 (rf/defn navigate-to-within-stack
   {:events [:navigate-to-within-stack]}
   [{:keys [db]} comp-id]
-  {:db (update db :modal-view-ids add-view-to-modals (first comp-id))
+  {:db (-> db
+           (update :modal-view-ids add-view-to-modals (first comp-id))
+           (assoc :view-id (first comp-id)))
    :fx [[:navigate-to-within-stack comp-id]]})
 
 (re-frame/reg-event-fx :open-modal