diff --git a/static/js/folderBrowserList.js b/static/js/folderBrowserList.js
index 1172ec813..81c8ad1b0 100644
--- a/static/js/folderBrowserList.js
+++ b/static/js/folderBrowserList.js
@@ -189,15 +189,17 @@ pandora.ui.folderBrowserList = function(id, section) {
                 }
             },
             init: function(data) {
+                var height = 16 + data.items * 16,
+                    hasItems = pandora.site.sectionFolders[section][i].hasItems;
                 pandora.site.sectionFolders[section][i].items = data.items;
                 pandora.$ui.folder[i].$content.css({
-                    height: 40 + (data.items || 1) * 16 + 'px'
+                    height: (data.items ? 24 : hasItems ? 40 : 0) + height + 'px'
                 });
                 pandora.$ui.folderList[id].css({
-                    height: 16 + data.items * 16 + 'px'
+                    height: height + 'px'
                 });
                 pandora.$ui.folderBrowser[id].size(2, data.items ? 0 : 16);
-                if (Ox.isBoolean(pandora.site.sectionFolders[section][i].hasItems)) {
+                if (Ox.isBoolean(hasItems)) {
                     // hasItems is set, so we're not on first init
                     pandora.resizeFolders();
                 }