diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 5895473d8f..0da5379ab8 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -5,7 +5,7 @@
         v-if="!forceExpand"
         class="panel-heading"
       >
-        <NavigationPins />
+        <NavigationPins :limit="6" />
         <div class="spacer"/>
         <button
           class="button-unstyled"
diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js
index 43be42759b..59ad808b2d 100644
--- a/src/components/navigation/navigation_pins.js
+++ b/src/components/navigation/navigation_pins.js
@@ -28,6 +28,7 @@ library.add(
   faList
 )
 const NavPanel = {
+  props: ['limit'],
   computed: {
     getters () {
       return this.$store.getters
@@ -67,7 +68,7 @@ const NavPanel = {
           isPrivate: this.privateMode,
           currentUser: this.currentUser
         }
-      )
+      ).slice(0, this.limit)
     }
   }
 }