diff --git a/superset/assets/src/SqlLab/main.less b/superset/assets/src/SqlLab/main.less
index c7be8fbc2..98759ca9f 100644
--- a/superset/assets/src/SqlLab/main.less
+++ b/superset/assets/src/SqlLab/main.less
@@ -204,6 +204,10 @@ div.Workspace {
     .SouthPane {
         height: 100%;
     }
+
+    .scrollbar-container {
+      overflow: auto;
+    }
 }
 
 .SqlEditorTabs li {