diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index 7df43e6b..a7533b55 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -84,6 +84,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 80bbfe59..b55deab5 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
@@ -98,7 +98,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 5d0e4ee6..2b5138ee 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 5fa9e43a..58c63dd2 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -496,7 +496,6 @@
     "hide_all_muted_posts": "Hide muted posts",
     "max_thumbnails": "Maximum amount of thumbnails per post (empty = no limit)",
     "hide_isp": "Hide instance-specific panel",
-    "show_third_column": "Move Notifications to a seperate column",
     "hide_shoutbox": "Hide instance frothbox",
     "compact_nav_panel": "Compact navigation panel",
     "compact_user_panel": "Compact user panel",
@@ -579,6 +578,7 @@
     "hide_followers_count_description": "Don't show follower count",
     "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",
     "nsfw_clickthrough": "Hide sensitive/NSFW media",
     "oauth_tokens": "OAuth tokens",
     "token": "Token",
diff --git a/src/modules/config.js b/src/modules/config.js
index b4d510da..750d917c 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -40,6 +40,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
   swapReacts: true,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index eb90a47e..cc625b3d 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -95,6 +95,7 @@ const defaultState = {
   scopeCopy: true,
   showFeaturesPanel: true,
   showInstanceSpecificPanel: false,
+  showNavShortcuts: true,
   sidebarRight: false,
   subjectLineBehavior: 'email',
   theme: 'pleroma-dark',