diff --git a/ghost/admin/assets/lib/editor/markdownEditor.js b/ghost/admin/assets/lib/editor/markdownEditor.js
index a35f7ab8fd..65a864e948 100644
--- a/ghost/admin/assets/lib/editor/markdownEditor.js
+++ b/ghost/admin/assets/lib/editor/markdownEditor.js
@@ -81,6 +81,9 @@
                     $(document).trigger('markdownEditorChange');
                 });
             },
+            isCursorAtEnd: function () {
+                return codemirror.getCursor('end').line > codemirror.lineCount() - 5;
+            },
             value: function () {
                 return codemirror.getValue();
             }
diff --git a/ghost/admin/assets/lib/editor/scrollHandler.js b/ghost/admin/assets/lib/editor/scrollHandler.js
index b996879240..05d6638cd6 100644
--- a/ghost/admin/assets/lib/editor/scrollHandler.js
+++ b/ghost/admin/assets/lib/editor/scrollHandler.js
@@ -21,6 +21,10 @@
                 ratio = previewHeight / markdownHeight,
                 previewPosition = $markdownViewPort.scrollTop() * ratio;
 
+            if (markdown.isCursorAtEnd()) {
+                previewPosition = previewHeight + 30;
+            }
+
             // apply new scroll
             $previewViewPort.scrollTop(previewPosition);
         }, 10);