diff --git a/src/main/mobile/components/modal.cljs b/src/main/mobile/components/modal.cljs
index 1858667711..9052d36be4 100644
--- a/src/main/mobile/components/modal.cljs
+++ b/src/main/mobile/components/modal.cljs
@@ -26,7 +26,10 @@
     (ion/modal
      {:isOpen (boolean open?)
       :presenting-element presenting-element
-      :onDidDismiss (fn [] (mobile-state/set-modal! nil))
+      :onDidDismiss (fn []
+                      (mobile-state/set-modal! nil)
+                      (state/clear-edit!)
+                      (state/pub-event! [:mobile/keyboard-will-hide]))
       :mode "ios"                                          ;; force card modal for android
       :expand "block"}
 
diff --git a/src/main/mobile/components/popup.cljs b/src/main/mobile/components/popup.cljs
index 3d2308450f..fb8d5d9b2e 100644
--- a/src/main/mobile/components/popup.cljs
+++ b/src/main/mobile/components/popup.cljs
@@ -70,14 +70,6 @@
 (set! shui/popup-show! popup-show!)
 (set! shui/popup-hide! popup-hide!)
 
-(rum/defc inner-content <
-  {:will-unmount (fn [state]
-                   (state/clear-edit!)
-                   (init/keyboard-hide)
-                   state)}
-  [content-fn]
-  (content-fn))
-
 (rum/defc popup < rum/reactive
   []
   (let [{:keys [open? content-fn opts]} (rum/react mobile-state/*popup-data)
@@ -101,7 +93,10 @@
       {:isOpen (boolean open?)
        :initialBreakpoint initial-breakpoint
        :breakpoints breakpoints
-       :onDidDismiss (fn [] (mobile-state/set-popup! nil))
+       :onDidDismiss (fn []
+                       (mobile-state/set-popup! nil)
+                       (state/clear-edit!)
+                       (state/pub-event! [:mobile/keyboard-will-hide]))
        :expand "block"}
       (:modal-props opts))
      (ion/content
@@ -111,4 +106,4 @@
          [:h2.py-2.opacity-40 title])
        (when content-fn
          (mobile-ui/classic-app-container-wrap
-          (inner-content content-fn)))]))))
+          (content-fn)))]))))