diff --git a/src/main/frontend/mobile/core.cljs b/src/main/frontend/mobile/core.cljs
index fe69a0947..e24985b3f 100644
--- a/src/main/frontend/mobile/core.cljs
+++ b/src/main/frontend/mobile/core.cljs
@@ -42,10 +42,14 @@
       (println "iOS container path: " path))
 
     ;; Keyboard watcher
-    (.addListener Keyboard "keyboardWillShow"
-                  #(state/pub-event! [:mobile/keyboard-will-show]))
-    ;; (.addListener Keyboard "keyboardDidShow"
-    ;;               #(state/pub-event! [:mobile/keyboard-did-show]))
+    ;; (.addListener Keyboard "keyboardWillShow"
+    ;;               #(state/pub-event! [:mobile/keyboard-will-show]))
+    (.addListener Keyboard "keyboardDidShow"
+                  #(state/pub-event! [:mobile/keyboard-did-show])))
+
+  (when (mobile-util/is-native-platform?)
+    (.addEventListener js/window "statusTap"
+                       #(util/scroll-to-top true))
     
     (.addListener App "appStateChange"
                   (fn [^js state]
@@ -54,8 +58,4 @@
                         (if is-active?
                           (p/do! (nfs-handler/refresh! repo repo/refresh-cb)
                                  (notification/show! "Notes updated!" :success true))
-                          (editor-handler/save-current-block!)))))))
-
-  (when (mobile-util/is-native-platform?)
-    (.addEventListener js/window "statusTap"
-                       #(util/scroll-to-top true))))
+                          (editor-handler/save-current-block!))))))))