diff --git a/app/assets/stylesheets/app/_main.scss b/app/assets/stylesheets/app/_main.scss
index 6a2de4be2..2cb8506ce 100644
--- a/app/assets/stylesheets/app/_main.scss
+++ b/app/assets/stylesheets/app/_main.scss
@@ -99,7 +99,6 @@ p {
   height: 100%;
   background-color: $bg-color;
   min-width: 100px;
-  overflow: auto;
   min-width: 900px;
 }
 
@@ -144,6 +143,7 @@ $section-header-height: 70px;
 
     display: block;
     height: 100%;
+    max-height: calc(100vh - #{$header-height});
     float: left;
     overflow-y: auto;
     overflow-x: hidden;
@@ -153,6 +153,7 @@ $section-header-height: 70px;
 
     > .content {
       height: 100%;
+      max-height: 100%;
       background-color: white;
       position: relative;
       box-shadow: 0px 0px 2px rgba(gray, 0.3);