diff --git a/client/src/views/site/navbar.js b/client/src/views/site/navbar.js
index 2a0291ce87..e8b533f34c 100644
--- a/client/src/views/site/navbar.js
+++ b/client/src/views/site/navbar.js
@@ -40,6 +40,12 @@ class NavbarSiteView extends View {
      */
     currentTab = null
 
+    /**
+     * @private
+     * @type {HTMLElement}
+     */
+    navbarHeaderElement
+
     events = {
         /** @this NavbarSiteView */
         'click .navbar-collapse.in a.nav-link': function (e) {
@@ -625,7 +631,7 @@ class NavbarSiteView extends View {
             $navbar.css('overflow', 'visible');
         }
 
-        const navbarBaseWidth = this.getFontSizeFactor() * (this.getThemeManager().getParam('navbarBaseWidth') || 550);
+        const navbarBaseWidth = this.navbarHeaderElement.clientWidth + this.$navbarRight.width();
 
         const tabCount = this.tabList.length;
 
@@ -756,7 +762,6 @@ class NavbarSiteView extends View {
             const windowHeight = window.innerHeight;
             const windowWidth = window.innerWidth;
 
-            const t = new Date().getMilliseconds();
             const navbarStaticItemsHeight = this.getStaticItemsHeight();
 
             this.$minimizer.removeClass('hidden');
@@ -960,6 +965,8 @@ class NavbarSiteView extends View {
         this.$navbarRightContainer = this.$navbar.find('> .navbar-body > .navbar-right-container');
         this.$navbarRight = this.$navbarRightContainer.children();
 
+        this.navbarHeaderElement = this.element.querySelector('.navbar-header');
+
         const handlerClassName = this.getThemeManager().getParam('navbarAdjustmentHandler');
 
         if (handlerClassName) {