diff --git a/resources/css/common.css b/resources/css/common.css
index 37e4d7f47b8..bc6d3cae0ad 100644
--- a/resources/css/common.css
+++ b/resources/css/common.css
@@ -1367,9 +1367,9 @@ a.tag:hover {
   margin-bottom: 8px;
 }
 
-.CodeMirror {
+.extensions__code>.CodeMirror {
   height: auto;
-  margin: 6px 0;
+  margin: 6px 0 0 0;
   font-family: Fira Code, Monaco, Menlo, Consolas, 'COURIER NEW', monospace;
 }
 
diff --git a/resources/css/style.css b/resources/css/style.css
index a8911e32376..6247c208ded 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -4,9 +4,9 @@
 @import "./reveal_black.min.css";
 @import "./katex.min.css";
 @import "../../static/css/tailwind.build.css"; /* Build by gulp. Check `_buildTailwind` for more detail */
+@import "./codemirror.min.css";
 @import "./common.css";
 @import "./datepicker.css";
 @import "./highlight.css";
-@import "./codemirror.min.css";
 @import "./table.css";
 @import "./excalidraw.min.css";
diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
index 1cfae56b23c..57834fd97b7 100644
--- a/src/main/frontend/components/block.cljs
+++ b/src/main/frontend/components/block.cljs
@@ -1052,11 +1052,12 @@
                           (reset! *dragging? false)
                           (reset! *dragging-block nil)
                           (editor-handler/unhighlight-block!))}]
-    [:div.flex.overflow-x-auto.overflow-y-hidden.relative
+    [:div.flex.relative
      [:div.flex-1.flex-col.relative.block-content
       (cond-> {:id (str "block-content-" uuid)
                :style {:cursor "text"
-                       :min-height 24}}
+                       :min-height 24
+                       :max-width 560}}
         (not slide?)
         (merge attrs))