diff --git a/src/main/mobile/components/app.css b/src/main/mobile/components/app.css
index 587855914c..857cc49f39 100644
--- a/src/main/mobile/components/app.css
+++ b/src/main/mobile/components/app.css
@@ -192,11 +192,11 @@ ul {
     max-width: calc(100vw - 40px);
 
     &[data-side=top] {
-      max-height: var(--top-popup-content-max-height, 50vh);
+      max-height: var(--top-popup-content-max-height, 60vh);
     }
 
     &[data-side=bottom] {
-      max-height: var(--bottom-popup-content-max-height, 50vh);
+      max-height: var(--bottom-popup-content-max-height, 60vh);
     }
   }
 }
diff --git a/src/main/mobile/components/popup.cljs b/src/main/mobile/components/popup.cljs
index e284f321c7..92867d52e8 100644
--- a/src/main/mobile/components/popup.cljs
+++ b/src/main/mobile/components/popup.cljs
@@ -65,7 +65,7 @@
 
 (defn- wrap-calc-commands-popup-side
   [pos opts]
-  (let [[side mh] (let [[_x y _ height] pos
+  (let [[side _mh] (let [[_x y _ height] pos
                         vh (.-clientHeight js/document.body)
                         [th bh] [(- y 85) (- vh (+ y height) 310)]
                         direction (if (> bh 280) "bottom"
@@ -74,8 +74,7 @@
                     (if (= "top" direction)
                       ["top" th]
                       ["bottom" bh]))]
-    (-> (assoc opts :auto-side? false)
-        (assoc :max-popup-height mh)
+    (-> (assoc opts :auto-side? true)
         (assoc-in [:content-props :side] side))))
 
 (defn popup-show!