diff --git a/superset/assets/visualizations/markup.css b/superset/assets/visualizations/markup.css
index 02c212bcce..455b60fd86 100644
--- a/superset/assets/visualizations/markup.css
+++ b/superset/assets/visualizations/markup.css
@@ -1,6 +1,5 @@
 .markup.slice_container {
     padding: 10px;
-    overflow: auto;
 }
 .separator {
     background-color: transparent !important;
diff --git a/superset/assets/visualizations/markup.js b/superset/assets/visualizations/markup.js
index 6a3cee0981..ba0ad446d0 100644
--- a/superset/assets/visualizations/markup.js
+++ b/superset/assets/visualizations/markup.js
@@ -4,6 +4,10 @@ require('./markup.css');
 
 function markupWidget(slice, payload) {
   $('#code').attr('rows', '15');
+  slice.container.css({
+    overflow: 'auto',
+    height: slice.container.height(),
+  });
   slice.container.html(payload.data.html);
 }