diff --git a/src/components/atoms/CodeEditor.tsx b/src/components/atoms/CodeEditor.tsx
index f2edbd4be3..12d614ef9f 100644
--- a/src/components/atoms/CodeEditor.tsx
+++ b/src/components/atoms/CodeEditor.tsx
@@ -86,6 +86,7 @@ class CodeEditor extends React.Component<CodeEditorProps> {
         [osName === 'macos' ? 'Cmd-Alt-F' : 'Ctrl-Alt-F']: 'findPersistent',
         Esc: 'clearSearch',
       },
+      scrollPastEnd: true,
     })
     this.codeMirror.on('change', this.handleCodeMirrorChange)
     window.addEventListener('codemirror-mode-load', this.reloadMode)
diff --git a/src/lib/CodeMirror.ts b/src/lib/CodeMirror.ts
index b8f19c426e..00de0bc3c7 100644
--- a/src/lib/CodeMirror.ts
+++ b/src/lib/CodeMirror.ts
@@ -4,6 +4,7 @@ import 'codemirror/addon/mode/overlay'
 import 'codemirror/addon/comment/comment'
 import 'codemirror/addon/edit/continuelist'
 import 'codemirror/addon/dialog/dialog'
+import 'codemirror/addon/scroll/scrollpastend'
 import 'codemirror/addon/search/search'
 import 'codemirror/addon/search/searchcursor'
 import 'codemirror/addon/search/jump-to-line'