diff --git a/src/status_im/accounts/handlers.cljs b/src/status_im/accounts/handlers.cljs
index 6b5bfbbdce..40330e5c48 100644
--- a/src/status_im/accounts/handlers.cljs
+++ b/src/status_im/accounts/handlers.cljs
@@ -155,11 +155,13 @@
   (let [accounts (->> (accounts-store/get-all)
                       (map (fn [{:keys [address] :as account}]
                              [address account]))
-                      (into {}))]
+                      (into {}))
+        view (if (empty? accounts)
+               :chat
+               :accounts)]
     (assoc db :accounts accounts
-              :view-id (if (empty? accounts)
-                         :chat
-                         :accounts))))
+              :view-id view
+              :navigation-stack (list view))))
 
 (register-handler :load-accounts load-accounts!)
 
diff --git a/src/status_im/accounts/screen.cljs b/src/status_im/accounts/screen.cljs
index bf765d262a..8bcac849e2 100644
--- a/src/status_im/accounts/screen.cljs
+++ b/src/status_im/accounts/screen.cljs
@@ -39,8 +39,6 @@
 
 (defn create-account [_]
   (dispatch-sync [:reset-app])
-  ; add accounts screen to history ( maybe there is a better way ? )
-  (dispatch [:navigate-to-clean :accounts])
   (dispatch [:navigate-to :chat console-chat-id]))
 
 (defview accounts []
diff --git a/src/status_im/accounts/views/account.cljs b/src/status_im/accounts/views/account.cljs
index fab60bff61..cc836c3fd7 100644
--- a/src/status_im/accounts/views/account.cljs
+++ b/src/status_im/accounts/views/account.cljs
@@ -11,7 +11,6 @@
             [status-im.accounts.styles :as st]))
 
 (defn on-press [address]
-  (dispatch [:navigate-to-clean :accounts])
   (dispatch [:navigate-to :login address])
   (dispatch [:set-in [:login :address] address]))