diff --git a/resources/skins.vector.styles/layout-max-width.less b/resources/skins.vector.styles/layout-max-width.less
index 2bb6200b7..a2b64c6e2 100644
--- a/resources/skins.vector.styles/layout-max-width.less
+++ b/resources/skins.vector.styles/layout-max-width.less
@@ -9,7 +9,6 @@
 .skin-vector-max-width {
 	@background-color-secondary--modern: #f8f9fa;
 	@max-width-page-container: 1650px;
-	@padding-horizontal-page-container: 30px;
 	@min-width-page-container--padded: @max-width-page-container + ( 2 * @padding-horizontal-page-container );
 	@background-color-page-container: @background-color-base;
 	@max-width-workspace-container: 1440px;
diff --git a/resources/skins.vector.styles/layout-search-header.less b/resources/skins.vector.styles/layout-search-header.less
index 1fdf703ac..e2ba819b8 100644
--- a/resources/skins.vector.styles/layout-search-header.less
+++ b/resources/skins.vector.styles/layout-search-header.less
@@ -15,9 +15,10 @@
 @padding-horizontal-page-container: 30px;
 @padding-horizontal-page-container-ems: unit( @padding-horizontal-page-container / @font-size-browser, em );
 @margin-horizontal-sidebar-button-icon-ems: unit( @margin-horizontal-sidebar-button-icon / @font-size-browser, em );
+@padding-horizontal-page-container-ems: unit( @padding-horizontal-page-container / @font-size-browser, em );
 
 // the width of the container if you exclude consideration for search
-@min-width-container-base: @size-sidebar-button + @margin-horizontal-sidebar-button-icon-ems + @min-width-logo + @min-width-personal-tools;
+@min-width-container-base: @padding-horizontal-page-container-ems + @size-sidebar-button + @margin-horizontal-sidebar-button-icon-ems + @min-width-logo + @min-width-personal-tools + @padding-horizontal-page-container-ems;
 
 @min-width-supported: @min-width-container-base + @min-width-search;
 @width-comfortable: @min-width-container-base + @margin-horizontal-search + @max-width-search + @margin-horizontal-search;
diff --git a/resources/skins.vector.styles/layout.less b/resources/skins.vector.styles/layout.less
index 00e48388d..18d3b9cf7 100644
--- a/resources/skins.vector.styles/layout.less
+++ b/resources/skins.vector.styles/layout.less
@@ -20,6 +20,7 @@
 	@margin-top-header + @margin-bottom-header +
 	2 * @padding-vertical-header;
 @width-grid-column-one: 11em;
+@padding-horizontal-page-container: 30px;
 
 // Default layout.
 @import 'layout-default.less';