diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 4e10623a0..7ae074b65 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -860,6 +860,11 @@ StScrollBar StButton#vhandle:active {
     padding: 4px 16px;
 }
 
+.all-apps > StBoxLayout {
+    /* horizontal padding to make sure the scrollbar doesn't overlap content */
+    padding: 0px 18px;
+}
+
 .app-folder-icon {
     padding: 5px;
 }
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index e34955ad7..2b1bd9ad4 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -176,7 +176,8 @@ const AllView = new Lang.Class({
                                          y_align: St.Align.START,
                                          x_expand: true,
                                          y_expand: true,
-                                         style_class: 'vfade' });
+                                         overlay_scrollbars: true,
+                                         style_class: 'all-apps vfade' });
         this.actor.add_actor(box);
         this.actor.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
         let action = new Clutter.PanAction({ interpolate: true });