diff --git a/web/styles/popovers.css b/web/styles/popovers.css
index d8228d73c4..ca8d68bed0 100644
--- a/web/styles/popovers.css
+++ b/web/styles/popovers.css
@@ -876,10 +876,11 @@ ul {
         }
     }
 
-    .popover-content {
+    .giphy-scrolling-container {
         overflow: auto;
         height: 200px;
         margin: 2px;
+        padding: 5px 0;
     }
 
     .popover-footer {
diff --git a/web/templates/giphy_picker.hbs b/web/templates/giphy_picker.hbs
index 72c069767c..4353669679 100644
--- a/web/templates/giphy_picker.hbs
+++ b/web/templates/giphy_picker.hbs
@@ -7,7 +7,7 @@
                 <i class="fa fa-remove" aria-hidden="true"></i>
             </button>
         </div>
-        <div class="popover-content" data-simplebar>
+        <div class="giphy-scrolling-container" data-simplebar>
             {{! We need a container we can replace
             without removing the simplebar wrappers.
             We replace the `giphy-content` when