diff --git a/libmproxy/web/static/app.css b/libmproxy/web/static/app.css
index a7dc4f001..8a2a43568 100644
--- a/libmproxy/web/static/app.css
+++ b/libmproxy/web/static/app.css
@@ -59,6 +59,7 @@ body,
 }
 .main-view {
   flex: 1 1 auto;
+  height: 0;
   display: flex;
   flex-direction: row;
 }
diff --git a/web/src/css/layout.less b/web/src/css/layout.less
index 5869411cd..1075d6c96 100644
--- a/web/src/css/layout.less
+++ b/web/src/css/layout.less
@@ -18,6 +18,11 @@ html, body, #container {
 .main-view {
     flex: 1 1 auto;
 
+    // All children of #container need an explicit height
+    // If we don't set this, the scrollbars disappear
+    // (https://github.com/mitmproxy/mitmproxy/issues/615)
+    height: 0;
+
     display: flex;
     flex-direction: row;