diff --git a/src/common/NavBar/NavBar.js b/src/common/NavBar/NavBar.js
index 1dcfeb56a..4a4a8bd47 100644
--- a/src/common/NavBar/NavBar.js
+++ b/src/common/NavBar/NavBar.js
@@ -22,15 +22,17 @@ const NavBar = ({ backButton, tabs, title, searchInput, userMenu }) => (
         }
         {
             tabs.length > 0 ?
-                tabs.map(({ href, icon, label }) => (
-                    <NavBarButton
-                        key={href}
-                        className={styles['nav-bar-button']}
-                        href={href}
-                        icon={icon}
-                        label={label}
-                    />
-                ))
+                <div className={styles['tabs-container']}>
+                    {tabs.map(({ href, icon, label }) => (
+                        <NavBarButton
+                            key={href}
+                            className={styles['nav-bar-button']}
+                            href={href}
+                            icon={icon}
+                            label={label}
+                        />
+                    ))}
+                </div>
                 :
                 <h2 className={styles['title']}>{title}</h2>
         }
diff --git a/src/common/NavBar/styles.less b/src/common/NavBar/styles.less
index 3e3fecb0e..d1569c4b7 100644
--- a/src/common/NavBar/styles.less
+++ b/src/common/NavBar/styles.less
@@ -2,9 +2,11 @@
     --nav-bar-height: 44px;
     font-size: 16px;
 
-    .nav-bar-button {
-        &:nth-of-type(n+4) {
-            display: none;
+    .tabs-container {
+        .nav-bar-button {
+            &:nth-child(n+5) {
+                display: none;
+            }
         }
     }
 }
@@ -17,6 +19,12 @@
     background-color: var(--color-secondarydark);
     overflow: hidden;
 
+    .tabs-container {
+        flex: none;
+        display: flex;
+        flex-direction: row;
+    }
+
     .nav-bar-button {
         max-width: calc(var(--nav-bar-height) * 3.5);
         height: var(--nav-bar-height);