diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index a28c37e3..6c0546c6 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -77,6 +77,10 @@ export default {
       return this.$store.getters.mergedConfig
     },
     sitename () { return this.$store.state.instance.name },
+    showNavShortcuts () {
+      return this.mergedConfig.showNavShortcuts
+    },
+
     hideSiteFavicon () {
       return this.mergedConfig.hideSiteFavicon
     },
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index e3fe47df..e2b5cf89 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -25,7 +25,7 @@
           </span>
         </router-link>
         <div
-          v-if="currentUser || !privateMode"
+          v-if="(currentUser || !privateMode) && showNavShortcuts"
           class="nav-items left"
         >
           <router-link
@@ -97,7 +97,7 @@
           @click.stop
         />
         <div
-          v-if="currentUser || !privateMode"
+          v-if="(currentUser || !privateMode) && showNavShortcuts"
           class="nav-items right"
         >
           <router-link
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index b805f5f6..f9d3feb2 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -35,6 +35,11 @@
             {{ $t('settings.hide_site_name') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting path="showNavShortcuts">
+            {{ $t('settings.show_nav_shortcuts') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting path="stopGifs">
             {{ $t('settings.stop_gifs') }}
diff --git a/src/i18n/en.json b/src/i18n/en.json
index e4391543..604685bb 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -459,6 +459,8 @@
         "hide_muted_threads": "Hide muted threads",
         "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
         "hide_shoutbox": "Hide instance shoutbox",
+        "hide_site_favicon": "Hide instance favicon in top panel",
+        "hide_site_name": "Hide instance name in top panel",
         "hide_threads_with_blocked_users": "Hide threads mentioning blocked users",
         "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
         "hide_wallpaper": "Hide instance wallpaper",
@@ -610,6 +612,7 @@
         "settings": "Settings",
         "show_admin_badge": "Show \"Admin\" badge in my profile",
         "show_moderator_badge": "Show \"Moderator\" badge in my profile",
+        "show_nav_shortcuts": "Show extra navigation shortcuts in top panel",
         "show_scrollbars": "Show side column's scrollbars",
         "show_yous": "Show (You)s",
         "stop_gifs": "Pause animated images until you hover on them",
diff --git a/src/modules/config.js b/src/modules/config.js
index 5fc6ac23..b88737f6 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -36,6 +36,7 @@ export const defaultState = {
   muteBotStatuses: undefined, // instance default
   collapseMessageWithSubject: undefined, // instance default
   padEmoji: true,
+  showNavShortcuts: undefined, // instance default
   hideSiteFavicon: undefined, // instance default
   hideSiteName: undefined, // instance default
   hideAttachments: false,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index ef6e3074..f91d88b3 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -51,6 +51,7 @@ const defaultState = {
   scopeCopy: true,
   showFeaturesPanel: true,
   showInstanceSpecificPanel: false,
+  showNavShortcuts: true,
   sidebarRight: false,
   subjectLineBehavior: 'email',
   theme: 'pleroma-dark',