diff --git a/src/app.css b/src/app.css
index 0e48e0c..8c76e64 100644
--- a/src/app.css
+++ b/src/app.css
@@ -3,7 +3,7 @@ body {
 }
 
 .app {
-  height: 100vh;
+  height: 100dvh;
   display: flex;
   flex-direction: column;
 }
diff --git a/src/components/Editor.tsx b/src/components/Editor.tsx
index 3ae96b5..8aee7c6 100644
--- a/src/components/Editor.tsx
+++ b/src/components/Editor.tsx
@@ -1,5 +1,5 @@
 import { EditorState } from '@codemirror/state';
-import { keymap, EditorView } from '@codemirror/view';
+import { keymap, EditorView, scrollPastEnd } from '@codemirror/view';
 import { defaultKeymap, history, historyKeymap } from '@codemirror/commands';
 import {
   defaultHighlightStyle,
@@ -33,6 +33,7 @@ function Editor(props: EditorProps) {
         EditorView.lineWrapping,
         history(),
         keymap.of([...defaultKeymap, ...historyKeymap]),
+        scrollPastEnd(),
         syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
         yCollab(ydoc.getText(), null),
       ],