diff --git a/src/main/capacitor/app.cljs b/src/main/capacitor/app.cljs
index 160239238e..4a5c7285d2 100644
--- a/src/main/capacitor/app.cljs
+++ b/src/main/capacitor/app.cljs
@@ -216,8 +216,15 @@
                   (not (nil? (state/get-editing-block)))
                   (state/exit-editing!)
 
+                  (seq (ui/get-modal))
+                  nil
+
                   :else
-                  (cc-utils/nav-pop!)))
+                  (-> (cc-utils/nav-length?)
+                    (p/then (fn [len]
+                              (if (= len 1)
+                                (.exitApp App)
+                                (cc-utils/nav-pop!)))))))
               ^js back-listener (.addListener App "backButton" handle-back!)]
           #(.remove back-listener)))
       [])
diff --git a/src/main/capacitor/app.css b/src/main/capacitor/app.css
index 9a34956605..bbf57c89d5 100644
--- a/src/main/capacitor/app.css
+++ b/src/main/capacitor/app.css
@@ -1,5 +1,5 @@
 html, body {
-  @apply text-[18px] leading-6;
+  @apply text-[18px] leading-6 min-h-[unset];
 }
 #root {
   @apply p-4;
diff --git a/src/main/capacitor/components/nav_utils.cljs b/src/main/capacitor/components/nav_utils.cljs
index 02f343d6c5..0e352e54ea 100644
--- a/src/main/capacitor/components/nav_utils.cljs
+++ b/src/main/capacitor/components/nav_utils.cljs
@@ -12,6 +12,9 @@
 (defn nav-pop! []
   (some-> @state/*nav-root (.pop)))
 
+(defn nav-length? []
+  (some-> ^js @state/*nav-root (.getLength)))
+
 (defn nav-to-block!
   [page-or-block opts]
   (nav-push! #(cc-blocks/page page-or-block opts)))
diff --git a/tailwind.capacitor.css b/tailwind.capacitor.css
index 7b5f0fbedd..43c429e88b 100644
--- a/tailwind.capacitor.css
+++ b/tailwind.capacitor.css
@@ -9,6 +9,7 @@
 @import "codemirror/lib/codemirror.css";
 @import "codemirror/theme/solarized.css";
 
+@import "src/main/frontend/common.css";
 @import "src/main/frontend/ui.css";
 @import "src/main/frontend/components/block.css";
 @import "src/main/frontend/components/property.css";