diff --git a/app/app/components/section/markdown/type-editor.js b/app/app/components/section/markdown/type-editor.js
index 507746a5..6912ecb5 100644
--- a/app/app/components/section/markdown/type-editor.js
+++ b/app/app/components/section/markdown/type-editor.js
@@ -10,7 +10,7 @@ export default Ember.Component.extend({
 
     didInsertElement() {
         let height = $(document).height() - $(".document-editor > .toolbar").height() - 130;
-        $("#markdown-editor").css("height", height);
+        $("#markdown-editor, #markdown-preview").css("height", height);
 
         this.renderPreview();
         let self = this;
diff --git a/app/app/templates/components/section/markdown/type-editor.hbs b/app/app/templates/components/section/markdown/type-editor.hbs
index 1813ba8f..30a39071 100644
--- a/app/app/templates/components/section/markdown/type-editor.hbs
+++ b/app/app/templates/components/section/markdown/type-editor.hbs
@@ -9,6 +9,7 @@
 	width: 100%;
 	padding: 10px;
 	background-color: white;
+	overflow: auto;
 }
 </style>
 
@@ -20,7 +21,6 @@
 			</div>
 			<div class="col-xs-6">
 				<div id="markdown-preview" class="mousetrap bordered wysiwyg">
-					{{pagePreview}}
 				</div>
 			</div>
 		</div>