diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index fd061a2d4..fb5ce29c5 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -21,7 +21,7 @@
 
   .panel {
     height: calc(100% - #{$header-height});
-    overflow-y: auto;
+    overflow-y: scroll;
 
     .container {
       padding-top: 20px;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index b969e59c5..c8b7cec89 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -640,7 +640,7 @@ input.search {
   height: 100%; }
   .conversation .panel {
     height: calc(100% - 64px);
-    overflow-y: auto; }
+    overflow-y: scroll; }
     .conversation .panel .container {
       padding-top: 20px;
       max-width: 910px;