diff --git a/ts/editor/codable.ts b/ts/editor/codable.ts
index e3d6345c7..def1b1c08 100644
--- a/ts/editor/codable.ts
+++ b/ts/editor/codable.ts
@@ -16,6 +16,7 @@ const codeMirrorOptions = {
     foldGutter: true,
     gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
     matchTags: { bothTags: true },
+    viewportMargin: Infinity,
 };
 
 const parser = new DOMParser();
diff --git a/ts/editor/editable.scss b/ts/editor/editable.scss
index a868e10f9..c502f7793 100644
--- a/ts/editor/editable.scss
+++ b/ts/editor/editable.scss
@@ -1,9 +1,5 @@
 @use 'ts/sass/scrollbar';
 
-@import "ts/sass/codemirror/lib/codemirror";
-@import "ts/sass/codemirror/theme/monokai";
-@import "ts/sass/codemirror/addon/fold/foldgutter";
-
 anki-editable {
     display: block;
     overflow-wrap: break-word;
@@ -45,3 +41,12 @@ img.drawing {
 [hidden] {
     display: none;
 }
+
+@import "ts/sass/codemirror/lib/codemirror";
+@import "ts/sass/codemirror/theme/monokai";
+@import "ts/sass/codemirror/addon/fold/foldgutter";
+
+.CodeMirror {
+    height: auto;
+    padding: 6px 0;
+}