3 files changed, 23 insertions, 2 deletions

diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 5ff059f52..504325c3a 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -77,12 +77,13 @@ class ServiceView extends Component {
       isSpellcheckerEnabled,
     } = this.props;
 
-    const { navigationBarBehaviour } = stores.settings.app;
+    const { navigationBarBehaviour, navigationBarManualActive } = stores.settings.app;
 
     const showNavBar =
       navigationBarBehaviour === 'always' ||
       (navigationBarBehaviour === 'custom' &&
-        service.recipe.id === CUSTOM_WEBSITE_RECIPE_ID);
+        service.recipe.id === CUSTOM_WEBSITE_RECIPE_ID) ||
+      navigationBarManualActive;
 
     const webviewClasses = classnames({
       services__webview: true,
diff --git a/src/config.ts b/src/config.ts
index 8b61b5698..e8ffb83f8 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -222,6 +222,7 @@ export const DEFAULT_APP_SETTINGS = {
   enableSpellchecking: true,
   spellcheckerLanguage: 'en-us',
   darkMode: false,
+  navigationBarManualActive: false,
   splitMode: false,
   splitColumns: 3,
   fallbackLocale: 'en-US',
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 50145dd47..98de80884 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -124,6 +124,10 @@ const menuItems = defineMessages({
     id: 'menu.view.toggleFullScreen',
     defaultMessage: 'Toggle Full Screen',
   },
+  toggleNavigationBar: {
+    id: 'menu.view.toggleNavigationBar',
+    defaultMessage: 'Toggle Navigation Bar',
+  },
   toggleDarkMode: {
     id: 'menu.view.toggleDarkMode',
     defaultMessage: 'Toggle Dark Mode',
@@ -460,6 +464,21 @@ const _titleBarTemplateFactory = (intl, locked) => [
         role: 'toggleFullScreen',
       },
       {
+        label: intl.formatMessage(menuItems.toggleNavigationBar),
+        accelerator: `${cmdOrCtrlShortcutKey()}+B`,
+        role: 'toggleNavigationBar',
+        type: 'checkbox',
+        checked: window['ferdium'].stores.settings.app.navigationBarManualActive,
+        click: () => {
+          window['ferdium'].actions.settings.update({
+            type: 'app',
+            data: {
+              navigationBarManualActive: !window['ferdium'].stores.settings.app.navigationBarManualActive,
+            }
+          });
+        }
+      },
+      {
         label: intl.formatMessage(menuItems.toggleDarkMode),
         type: 'checkbox',
         accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+D`,