diff --git a/src/main/frontend/components/user/login.cljs b/src/main/frontend/components/user/login.cljs
index ae37d1466dc..271df608b2e 100644
--- a/src/main/frontend/components/user/login.cljs
+++ b/src/main/frontend/components/user/login.cljs
@@ -3,6 +3,7 @@
             [frontend.rum :refer [adapt-class]]
             [frontend.modules.shortcut.core :as shortcut]
             [frontend.handler.user :as user]
+            [frontend.handler.route :as route-handler]
             [cljs-bean.core :as bean]
             [frontend.handler.notification :as notification]
             [frontend.state :as state]
@@ -41,7 +42,9 @@
         (when session
           (user/login-callback session)
           (notification/show! (str "Hi, " username " :)") :success)
-          (state/close-modal!)))
+          (state/close-modal!)
+          (when (= :user-login (state/get-current-route))
+            (route-handler/redirect! {:to :home}))))
       [])
 
     nil))
@@ -72,15 +75,19 @@
                  user'          (bean/->clj user)]
              (user-pane sign-out! user')))))]))
 
-(rum/defcs page <
+(rum/defcs modal-inner <
   shortcut/disable-all-shortcuts
   [_state]
   (page-impl))
 
+(rum/defc page
+  []
+  [:div.pt-10 (page-impl)])
+
 (defn open-login-modal!
   []
   (state/set-modal!
-    (fn [_close] (page))
+    (fn [_close] (modal-inner))
     {:close-btn?      true
      :label           "user-login"
      :close-backdrop? false
diff --git a/src/main/frontend/handler/events.cljs b/src/main/frontend/handler/events.cljs
index 0cd1e90b67b..acde5a59be4 100644
--- a/src/main/frontend/handler/events.cljs
+++ b/src/main/frontend/handler/events.cljs
@@ -124,7 +124,9 @@
 (defmethod handle :user/login [[_ host-ui?]]
   (if (or host-ui? (not util/electron?))
     (js/window.open config/LOGIN-URL)
-    (login/open-login-modal!)))
+    (if (mobile-util/native-platform?)
+      (route-handler/redirect! {:to :user-login})
+      (login/open-login-modal!))))
 
 (defmethod handle :graph/added [[_ repo {:keys [empty-graph?]}]]
   (db/set-key-value repo :ast/version db-schema/ast-version)