diff --git a/src/status_im/navigation/effects.cljs b/src/status_im/navigation/effects.cljs
index e28550cc71..181884cbad 100644
--- a/src/status_im/navigation/effects.cljs
+++ b/src/status_im/navigation/effects.cljs
@@ -104,14 +104,14 @@
 ;;;; Navigate to within stack
 
 (defn- navigate-to-within-stack
-  [[component comp-id]]
+  [[component comp-id theme]]
   (let [{:keys [options]} (get views/screens component)]
     (navigation/push
      (name comp-id)
      {:component {:id      component
                   :name    component
                   :options (merge
-                            (options/root-options {:theme (:theme options)})
+                            (options/root-options {:theme theme})
                             options)}})
     (state/navigation-state-push {:id     component
                                   :type   :stack
diff --git a/src/status_im/navigation/events.cljs b/src/status_im/navigation/events.cljs
index cf4ac22a7a..aae7cfd20d 100644
--- a/src/status_im/navigation/events.cljs
+++ b/src/status_im/navigation/events.cljs
@@ -29,7 +29,7 @@
   {:events [:navigate-to-within-stack]}
   [{:keys [db]} comp-id screen-params]
   {:db (all-screens-params db (first comp-id) screen-params)
-   :fx [[:navigate-to-within-stack comp-id]]})
+   :fx [[:navigate-to-within-stack (conj comp-id (:theme db))]]})
 
 (re-frame/reg-event-fx :open-modal
  (fn [{:keys [db]} [component screen-params]]