diff --git a/public/javascripts/Gallery/css/gallery.css b/public/javascripts/Gallery/css/gallery.css
index a212ce9ca2..b3866d4373 100644
--- a/public/javascripts/Gallery/css/gallery.css
+++ b/public/javascripts/Gallery/css/gallery.css
@@ -45,7 +45,7 @@
 /* Note that the side bar is out of the "flow" of the grid container b/c it is fixed when we aren't loading anything. */
 .sidebar {
     padding-left: 10px;
-    min-height: calc(100vh - 610px);
+    min-height: 100vh;
     height: 100%;
     width: 239px;
     grid-row: 1/2;
@@ -90,6 +90,8 @@
         'main gallery-modal'
         'paging gallery-modal';
     grid-gap: 2px;
+    margin-bottom: 10px;
+    min-height: 70vh;
     padding: 0 10px 10px 10px;
 }
 
diff --git a/public/javascripts/Gallery/src/cards/CardContainer.js b/public/javascripts/Gallery/src/cards/CardContainer.js
index 90f1ec27f8..5a5a04f6de 100644
--- a/public/javascripts/Gallery/src/cards/CardContainer.js
+++ b/public/javascripts/Gallery/src/cards/CardContainer.js
@@ -338,7 +338,7 @@ function CardContainer(uiCardContainer, initialFilters) {
                 sg.ui.cardFilter.wrapper.css('position', 'fixed');
                 sg.ui.cardFilter.wrapper.css('top', '');
                 uiCardContainer.holder.css('margin-left', sg.ui.cardFilter.wrapper.css('width'));
-                sg.scrollStatus.stickySidebar = true;
+                imagePromises.length >= 6 ? sg.scrollStatus.stickySidebar = true : sg.scrollStatus.stickySidebar = false;
                 sg.cardFilter.enable();
             });
         } else {