diff --git a/components/nav/TopLevelMenu.vue b/components/nav/TopLevelMenu.vue
index 22b270449a..8f77a34809 100644
--- a/components/nav/TopLevelMenu.vue
+++ b/components/nav/TopLevelMenu.vue
@@ -143,12 +143,13 @@ export default {
 
   methods: {
     // Cluster list number of items shown is configurbale via user preference
-    setClusterListHeight(a) {
+    setClusterListHeight(maxToShow) {
       const el = this.$refs.clusterList;
+      const max = Math.min(maxToShow, this.clusters.length);
 
       if (el) {
         const $el = $(el);
-        const h = 34 * a;
+        const h = 34 * max;
 
         $el.css('height', `${ h }px`);
       }
@@ -213,7 +214,7 @@ export default {
             />
             <i v-if="clusterFilter.length > 0" class="icon icon-close" @click="clusterFilter=''" />
           </div>
-          <div ref="clusterList" class="clusters" :class="{'fixed-height': showClusterSearch}">
+          <div ref="clusterList" class="clusters">
             <div v-for="c in clusters" :key="c.id" @click="hide()">
               <nuxt-link
                 v-if="c.ready"
@@ -543,10 +544,6 @@ export default {
       .clusters {
         overflow-y: scroll;
         overflow-x: hidden;
-
-        &.fixed-height {
-          height: $option-height * 4;
-        }
       }
 
       .none-matching {
diff --git a/pages/prefs.vue b/pages/prefs.vue
index 8556048a48..a8a7ddb0a3 100644
--- a/pages/prefs.vue
+++ b/pages/prefs.vue
@@ -183,8 +183,7 @@ export default {
       </div>
     </div>
 
-    <hr />
-    <div class="row">
+    <div class="row mt-20">
       <div class="col span-4">
         <LabeledSelect
           v-model.number="menuMaxClusters"