diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index e598fc8d47cc..39e56a738a6a 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -111,7 +111,7 @@
         width: 100%;
         margin: 0;
         padding: 10px 0 0 0;
-        overflow-y: overlay;
+        overflow-y: auto;
       }
     }
   }
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index c41140c51adf..8dd901fe1231 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -24,7 +24,7 @@
   .content {
     background-color: $grey_l;
     flex-grow: 1;
-    overflow-y: overlay;
+    overflow-y: auto;
   }
 }
 .network-status-container {
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index e1444de7e7d1..4b0b19007b29 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -868,7 +868,7 @@ img.emoji.jumbo {
   .gutter .content {
     background-color: #f3f3f3;
     flex-grow: 1;
-    overflow-y: overlay; }
+    overflow-y: auto; }
 
 .network-status-container .network-status {
   background: url("/images/error_red.svg") no-repeat left 10px center;
@@ -1158,7 +1158,7 @@ input.search {
         width: 100%;
         margin: 0;
         padding: 10px 0 0 0;
-        overflow-y: overlay; }
+        overflow-y: auto; }
 
 .discussion-container {
   background-color: #eee; }