diff --git a/src/common/MainNavBars/MainNavBars.js b/src/common/MainNavBars/MainNavBars.js
index 4e78105e1..5228db7b1 100644
--- a/src/common/MainNavBars/MainNavBars.js
+++ b/src/common/MainNavBars/MainNavBars.js
@@ -8,7 +8,8 @@ const TABS = [
     { id: 'board', label: 'Board', icon: 'ic_board', href: '#/' },
     { id: 'discover', label: 'Discover', icon: 'ic_discover', href: '#/discover' },
     { id: 'library', label: 'Library', icon: 'ic_library', href: '#/library' },
-    { id: 'settings', label: 'Settings', icon: 'ic_settings', href: '#/settings' }
+    { id: 'settings', label: 'Settings', icon: 'ic_settings', href: '#/settings' },
+    { id: 'addons', label: 'Addons', icon: 'ic_addons', href: '#/addons' }
 ];
 
 const MainNavBars = React.memo(({ className, route, query, children }) => {
diff --git a/src/routes/Addons/Addons.js b/src/routes/Addons/Addons.js
index 51a9eda78..a953a62d4 100644
--- a/src/routes/Addons/Addons.js
+++ b/src/routes/Addons/Addons.js
@@ -2,7 +2,7 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const { useRouteFocused } = require('stremio-router');
 const Icon = require('stremio-icons/dom');
-const { AddonDetailsModal, Button, Multiselect, NavBar, TextInput, SharePrompt, ModalDialog, useBinaryState } = require('stremio/common');
+const { AddonDetailsModal, Button, Multiselect, MainNavBars, TextInput, SharePrompt, ModalDialog, useBinaryState } = require('stremio/common');
 const Addon = require('./Addon');
 const useAddons = require('./useAddons');
 const useSelectableInputs = require('./useSelectableInputs');
@@ -83,8 +83,7 @@ const Addons = ({ urlParams, queryParams }) => {
         clearSharedTransportUrl();
     }, [urlParams, queryParams]);
     return (
-        <div className={styles['addons-container']}>
-            <NavBar className={styles['nav-bar']} backButton={true} title={'Addons'} />
+        <MainNavBars className={styles['addons-container']} route={'addons'}>
             <div className={styles['addons-content']}>
                 <div className={styles['selectable-inputs-container']}>
                     <Button className={styles['add-button-container']} title={'Add addon'} onClick={openAddAddonModal}>
@@ -201,7 +200,7 @@ const Addons = ({ urlParams, queryParams }) => {
                     :
                     null
             }
-        </div>
+        </MainNavBars>
     );
 };
 
diff --git a/src/routes/Addons/styles.less b/src/routes/Addons/styles.less
index f7ef52dcd..c69c83ce8 100644
--- a/src/routes/Addons/styles.less
+++ b/src/routes/Addons/styles.less
@@ -3,20 +3,13 @@
 }
 
 .addons-container {
-    display: flex;
-    flex-direction: column;
     width: 100%;
     height: 100%;
     background-color: var(--color-background);
 
-    .nav-bar {
-        flex: none;
-        align-self: stretch;
-    }
-
     .addons-content {
-        flex: 1;
-        align-self: stretch;
+        width: 100%;
+        height: 100%;
         display: flex;
         flex-direction: column;