diff --git a/Themes/default/Admin.template.php b/Themes/default/Admin.template.php
index 50abe978c5..ebb478f63f 100644
--- a/Themes/default/Admin.template.php
+++ b/Themes/default/Admin.template.php
@@ -1331,8 +1331,8 @@ function template_admin_search_results()
 
 	echo '
 						<div id="section_header" class="cat_bar">
+							', template_admin_quick_search(), '
 							<h3 class="catbg">
-								', template_admin_quick_search(), '
 								<span id="quick_search_results">
 									', sprintf($txt['admin_search_results_desc'], $context['search_term']), '
 								</span>
diff --git a/Themes/default/GenericMenu.template.php b/Themes/default/GenericMenu.template.php
index 7957598089..b74ecfa3cf 100644
--- a/Themes/default/GenericMenu.template.php
+++ b/Themes/default/GenericMenu.template.php
@@ -154,13 +154,15 @@ function template_generic_menu_tabs(&$menu_context)
 	if (!empty($tab_context['title']))
 	{
 		echo '
-					<div class="cat_bar">
-						<h3 class="catbg">';
+					<div class="cat_bar">';
 
 		// The function is in Admin.template.php, but since this template is used elsewhere too better check if the function is available
 		if (function_exists('template_admin_quick_search'))
 			template_admin_quick_search();
 
+		echo '
+						<h3 class="catbg">';
+
 		// Exactly how many tabs do we have?
 		if (!empty($context['tabs']))
 		{
diff --git a/Themes/default/css/admin.css b/Themes/default/css/admin.css
index d582025007..f0d7b2e2dc 100644
--- a/Themes/default/css/admin.css
+++ b/Themes/default/css/admin.css
@@ -50,7 +50,7 @@ legend {
 ------------------------------------------------------- */
 /* Admin quick search bar, and results page. */
 .admin_search {
-	margin: -3px 0;
+	padding: 5px;
 	font-size: 0.9em;
 	float: right;
 	display: flex;
diff --git a/Themes/default/css/responsive.css b/Themes/default/css/responsive.css
index aa79ab4e74..a2caa43805 100644
--- a/Themes/default/css/responsive.css
+++ b/Themes/default/css/responsive.css
@@ -421,8 +421,6 @@
 	/* Admin */
 	.admin_search {
 		float: none;
-		width: 100%;
-		margin-bottom: 10px;
 	}
 	.table_grid.half_content {
 		width: 100%;