diff --git a/src/main/frontend/components/editor.cljs b/src/main/frontend/components/editor.cljs
index deafb296c2f..8c80fe97a76 100644
--- a/src/main/frontend/components/editor.cljs
+++ b/src/main/frontend/components/editor.cljs
@@ -392,11 +392,9 @@
                 :z-index    11}
                (when set-default-width?
                  {:width max-width})
-               (when-let [^js/HTMLElement editor
-                          (js/document.querySelector ".editor-wrapper")]
-                 (if (<= (.-clientWidth editor) (+ left (if set-default-width? max-width 500)))
-                   {:right 0}
-                   {:left (if (or (nil? y-diff) (and y-diff (= y-diff 0))) left 0)})))]
+               (if (<= vw-max-width (+ left (if set-default-width? max-width 500)))
+                 {:right 0}
+                 {:left (if (or (nil? y-diff) (and y-diff (= y-diff 0))) left 0)}))]
     [:div.absolute.rounded-md.shadow-lg.absolute-modal
      {:ref *el
       :data-modal-name modal-name
diff --git a/src/main/frontend/components/editor.css b/src/main/frontend/components/editor.css
index 1223c6ca1df..e6083c819c9 100644
--- a/src/main/frontend/components/editor.css
+++ b/src/main/frontend/components/editor.css
@@ -42,8 +42,10 @@
   }
 
   &[data-modal-name="commands"] {
-    width: 380px !important;
-    max-width: 90vw !important;
+    @screen sm {
+      width: 380px !important;
+      max-width: 90vw !important;
+    }
   }
 }