diff --git a/resources/skins.vector.styles/layout-search-header.less b/resources/skins.vector.styles/layout-search-header.less
index 5990882e1..7259d6baf 100644
--- a/resources/skins.vector.styles/layout-search-header.less
+++ b/resources/skins.vector.styles/layout-search-header.less
@@ -31,8 +31,13 @@
 	#p-search {
 		// Override values to reflect new behaviour.
 		min-width: @min-width-search;
-		max-width: @max-width-search;
-		margin: 0 @margin-horizontal-search;
+		max-width: 100%;
+		margin: 0 0 0 @margin-horizontal-search;
+
+		#searchform {
+			margin-left: auto;
+			max-width: @max-width-search;
+		}
 	}
 
 	// Support IE9: float will be disabled if display flex is supported
@@ -44,6 +49,7 @@
 	#p-personal {
 		text-align: right;
 		flex-basis: @min-width-personal-tools;
+		margin-left: @margin-horizontal-search;
 
 		// Support IE9: This is reset in @support query below if Flexbox is available.
 		float: right;