diff --git a/src/status_im/contexts/profile/settings/list_items.cljs b/src/status_im/contexts/profile/settings/list_items.cljs
index e1887e209b..35fe3b1d82 100644
--- a/src/status_im/contexts/profile/settings/list_items.cljs
+++ b/src/status_im/contexts/profile/settings/list_items.cljs
@@ -36,7 +36,7 @@
      :blur?       true
      :action      :arrow}
     {:title        (i18n/label :t/wallet)
-     :on-press     #(rf/dispatch [:open-modal :screen/settings.wallet])
+     :on-press     #(rf/dispatch [:navigate-to-within-stack [:screen/settings.wallet :screen/settings]])
      :image-props  :i/wallet
      :image        :icon
      :blur?        true
diff --git a/src/status_im/contexts/settings/wallet/wallet_options/view.cljs b/src/status_im/contexts/settings/wallet/wallet_options/view.cljs
index d5573ae8fe..cfb356185a 100644
--- a/src/status_im/contexts/settings/wallet/wallet_options/view.cljs
+++ b/src/status_im/contexts/settings/wallet/wallet_options/view.cljs
@@ -8,11 +8,11 @@
 
 (defn open-saved-addresses-settings-modal
   []
-  (rf/dispatch [:open-modal :screen/settings.saved-addresses]))
+  (rf/dispatch [:navigate-to-within-stack [:screen/settings.saved-addresses :screen/settings]]))
 
 (defn open-keypairs-and-accounts-settings-modal
   []
-  (rf/dispatch [:open-modal :screen/settings.keypairs-and-accounts]))
+  (rf/dispatch [:navigate-to-within-stack [:screen/settings.keypairs-and-accounts :screen/settings]]))
 
 (defn basic-settings-options
   []
@@ -38,7 +38,7 @@
 
 (defn open-network-settings-modal
   []
-  (rf/dispatch [:open-modal :screen/settings.network-settings]))
+  (rf/dispatch [:navigate-to-within-stack [:screen/settings.network-settings :screen/settings]]))
 
 (defn advanced-settings-options
   []