diff --git a/application/Espo/Resources/metadata/themes/Espo.json b/application/Espo/Resources/metadata/themes/Espo.json
index 95927b2537..7356789dbb 100644
--- a/application/Espo/Resources/metadata/themes/Espo.json
+++ b/application/Espo/Resources/metadata/themes/Espo.json
@@ -1,5 +1,6 @@
 {
     "stylesheet": "client/css/espo.css",
     "dashboardCellHeight": 155,
-    "dashboardCellMargin": 19
+    "dashboardCellMargin": 19,
+    "navbarHeight": 44
 }
\ No newline at end of file
diff --git a/application/Espo/Resources/metadata/themes/Sakura.json b/application/Espo/Resources/metadata/themes/Sakura.json
index e107e75aa1..a2d1175c76 100644
--- a/application/Espo/Resources/metadata/themes/Sakura.json
+++ b/application/Espo/Resources/metadata/themes/Sakura.json
@@ -1,5 +1,6 @@
 {
     "stylesheet": "client/css/sakura.css",
     "dashboardCellHeight": 155,
-    "dashboardCellMargin": 19
+    "dashboardCellMargin": 19,
+    "navbarHeight": 44
 }
\ No newline at end of file
diff --git a/application/Espo/Resources/metadata/themes/Violet.json b/application/Espo/Resources/metadata/themes/Violet.json
index 74abd50e99..ef6c35d407 100644
--- a/application/Espo/Resources/metadata/themes/Violet.json
+++ b/application/Espo/Resources/metadata/themes/Violet.json
@@ -1,5 +1,6 @@
 {
     "stylesheet": "client/css/violet.css",
     "dashboardCellHeight": 155,
-    "dashboardCellMargin": 19
+    "dashboardCellMargin": 19,
+    "navbarHeight": 44
 }
\ No newline at end of file
diff --git a/client/src/views/site/navbar.js b/client/src/views/site/navbar.js
index 60ba91e99b..aec283e9b8 100644
--- a/client/src/views/site/navbar.js
+++ b/client/src/views/site/navbar.js
@@ -181,10 +181,11 @@ Espo.define('views/site/navbar', 'view', function (Dep) {
 
                 var tabCount = this.tabList.length;
                 var $navbar = $('#navbar .navbar');
-                var navbarNeededHeight = 45;
+                var navbarNeededHeight = (this.getThemeManager().getParam('navbarHeight') || 44) + 1;
 
                 $moreDd = $('#nav-more-tabs-dropdown');
 
+                var navbarBaseWidth = this.getThemeManager().getParam('navbarBaseWidth') || 546;
 
                 var updateWidth = function () {
                     var windowWidth = $(window.document).width();
@@ -203,7 +204,7 @@ Espo.define('views/site/navbar', 'view', function (Dep) {
 
                     var headerWidth = this.$el.width();
 
-                    var maxWidth = headerWidth - 546 - moreWidth;
+                    var maxWidth = headerWidth - navbarBaseWidth - moreWidth;
                     var width = $tabs.width();
 
                     var i = 0;