diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl
index bc684e7657..19977f05a9 100644
--- a/templates/admin/base/search.tmpl
+++ b/templates/admin/base/search.tmpl
@@ -1,6 +1,12 @@
-<div class="ui right floated secondary filter menu">
-<!-- Sort -->
-	<div class="ui dropdown type jump item">
+<div class="ui secondary filter menu gt-ac gt-mx-0">
+	<form class="ui form ignore-dirty gt-f1">
+		<div class="ui fluid action input">
+			{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
+			<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+		</div>
+	</form>
+	<!-- Sort -->
+	<div class="ui dropdown type jump item gt-mr-0">
 		<span class="text">
 			{{.locale.Tr "repo.issues.filter_sort"}}
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -15,9 +21,3 @@
 		</div>
 	</div>
 </div>
-<form class="ui form ignore-dirty">
-	<div class="ui fluid action input">
-		{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
-		<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
-	</div>
-</form>
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index db15887d98..67e9cb05e8 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -4,9 +4,15 @@
 			{{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 		</h4>
 		<div class="ui attached segment">
-			<div class="ui right floated secondary filter menu">
-			<!-- Sort -->
-				<div class="ui dropdown type jump item">
+			<div class="ui secondary filter menu gt-ac gt-mx-0">
+				<form class="ui form ignore-dirty gt-f1">
+					<div class="ui fluid action input">
+						{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
+						<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+					</div>
+				</form>
+				<!-- Sort -->
+				<div class="ui dropdown type jump item gt-mr-0">
 					<span class="text">
 						{{.locale.Tr "repo.issues.filter_sort"}}
 						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -19,12 +25,6 @@
 					</div>
 				</div>
 			</div>
-			<form class="ui form ignore-dirty">
-				<div class="ui fluid action input">
-					{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
-					<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
-				</div>
-			</form>
 		</div>
 		<div class="ui attached table segment">
 			<table class="ui very basic striped table unstackable">
diff --git a/templates/admin/repo/search.tmpl b/templates/admin/repo/search.tmpl
index cb9aad1a66..0d98e3e4f2 100644
--- a/templates/admin/repo/search.tmpl
+++ b/templates/admin/repo/search.tmpl
@@ -1,6 +1,12 @@
-<div class="ui right floated secondary filter menu">
+<div class="ui secondary filter menu gt-ac gt-mx-0">
+	<form class="ui form ignore-dirty gt-f1">
+		<div class="ui fluid action input">
+			{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
+			<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+		</div>
+	</form>
 	<!-- Sort -->
-	<div class="ui dropdown type jump item">
+	<div class="ui dropdown type jump item gt-mr-0">
 		<span class="text">
 			{{.locale.Tr "repo.issues.filter_sort"}}
 				{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -21,9 +27,3 @@
 		</div>
 	</div>
 </div>
-<form class="ui form ignore-dirty">
-	<div class="ui fluid action input">
-		{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
-		<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
-	</div>
-</form>
diff --git a/templates/code/searchform.tmpl b/templates/code/searchform.tmpl
index 822102fc70..a8c8e6576d 100644
--- a/templates/code/searchform.tmpl
+++ b/templates/code/searchform.tmpl
@@ -1,4 +1,4 @@
-<form class="ui form ignore-dirty" style="max-width: 100%">
+<form class="ui form ignore-dirty">
 	<div class="ui fluid action input">
 		{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true "Disabled" .CodeIndexerUnavailable}}
 		<div class="ui dropdown selection {{if .CodeIndexerUnavailable}} disabled{{end}}" data-tooltip-content="{{.locale.Tr "explore.search.type.tooltip"}}">
diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl
index c1a1418349..fbce9dcdd9 100644
--- a/templates/explore/repo_search.tmpl
+++ b/templates/explore/repo_search.tmpl
@@ -1,6 +1,19 @@
-<div class="ui right floated secondary filter menu">
+<div class="ui secondary filter menu gt-ac gt-mx-0">
+	<form class="ui form ignore-dirty gt-f1">
+		<input type="hidden" name="sort" value="{{$.SortType}}">
+		<input type="hidden" name="language" value="{{$.Language}}">
+		<div class="ui fluid action input">
+			{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
+			{{if .PageIsExploreRepositories}}
+				<input type="hidden" name="only_show_relevant" value="{{.OnlyShowRelevant}}">
+			{{else}}
+				<input type="hidden" name="tab" value="repositories">
+			{{end}}
+			<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+		</div>
+	</form>
 	<!-- Sort -->
-	<div class="ui right dropdown type jump item">
+	<div class="ui dropdown type jump item gt-mr-0">
 		<span class="text">
 			{{.locale.Tr "repo.issues.filter_sort"}}
 				{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -21,19 +34,6 @@
 		</div>
 	</div>
 </div>
-<form class="ui form ignore-dirty">
-	<input type="hidden" name="sort" value="{{$.SortType}}">
-	<input type="hidden" name="language" value="{{$.Language}}">
-	<div class="ui fluid action input">
-		{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
-		{{if .PageIsExploreRepositories}}
-			<input type="hidden" name="only_show_relevant" value="{{.OnlyShowRelevant}}">
-		{{else}}
-			<input type="hidden" name="tab" value="repositories">
-		{{end}}
-		<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
-	</div>
-</form>
 {{if and .PageIsExploreRepositories .OnlyShowRelevant}}
 	<div class="ui message explore-relevancy-note">
 		<span data-tooltip-content="{{.locale.Tr "explore.relevant_repositories_tooltip"}}">{{.locale.Tr "explore.relevant_repositories" ((printf "%s%s" $.Link "?only_show_relevant=0")|Escape) | Safe}}</span>
diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl
index 70780648b2..11f3b7ba34 100644
--- a/templates/explore/search.tmpl
+++ b/templates/explore/search.tmpl
@@ -1,6 +1,12 @@
-<div class="ui right floated secondary filter menu">
-<!-- Sort -->
-	<div class="ui right dropdown type jump item">
+<div class="ui secondary filter menu gt-ac gt-mx-0">
+	<form class="ui form ignore-dirty gt-f1">
+		<div class="ui fluid action input">
+			{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
+			<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+		</div>
+	</form>
+	<!-- Sort -->
+	<div class="ui dropdown type jump item gt-mr-0">
 		<span class="text">
 			{{.locale.Tr "repo.issues.filter_sort"}}
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -15,10 +21,4 @@
 		</div>
 	</div>
 </div>
-<form class="ui form ignore-dirty">
-	<div class="ui fluid action input">
-		{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}}
-		<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
-	</div>
-</form>
 <div class="ui divider"></div>