diff --git a/Sources/ManageMaintenance.php b/Sources/ManageMaintenance.php
index c26f811240..a8dd686d8e 100644
--- a/Sources/ManageMaintenance.php
+++ b/Sources/ManageMaintenance.php
@@ -818,7 +818,7 @@ function AdminBoardRecount()
 	validateToken(!isset($_REQUEST['step']) ? 'admin-maint' : 'admin-boardrecount');
 	$context['not_done_token'] = 'admin-boardrecount';
 	createToken($context['not_done_token']);
-	
+
 	$context['page_title'] = $txt['not_done_title'];
 	$context['continue_post_data'] = '';
 	$context['continue_countdown'] = 3;
@@ -1867,13 +1867,6 @@ function($hook) use ($current_filter)
 	foreach ($hooks as $hook => $functions)
 		$hooks_filters[] = '<option' . ($current_filter == $hook ? ' selected ' : '') . ' value="' . $hook . '">' . $hook . '</option>';
 
-	if (!empty($hooks_filters))
-		$context['insert_after_template'] .= '
-		<script>
-			var hook_name_header = document.getElementById(\'header_list_integration_hooks_hook_name\');
-			hook_name_header.innerHTML += ' . JavaScriptEscape('<select style="margin-left:15px;" onchange="window.location=(\'' . $scripturl . '?action=admin;area=maintain;sa=hooks\' + (this.value ? \';filter=\' + this.value : \'\'));"><option value="">' . $txt['hooks_reset_filter'] . '</option>' . implode('', $hooks_filters) . '</select>') . ';
-		</script>';
-
 	if (!empty($_REQUEST['do']) && isset($_REQUEST['hook']) && isset($_REQUEST['function']))
 	{
 		checkSession('request');
@@ -2019,6 +2012,15 @@ function($accumulator, $functions)
 					<li><span class="main_icons error"></span> ' . $txt['hooks_disable_legend_temp_missing'] . '</li>
 				</ul>'
 			),
+			array(
+				'position' => 'above_column_headers',
+				'value' => '
+				<select onchange="window.location=(\'' . $scripturl . '?action=admin;area=maintain;sa=hooks\' + (this.value ? \';filter=\' + this.value : \'\'));">
+					<option value="">' . $txt['hooks_reset_filter'] . '</option>
+					' . implode('', $hooks_filters) . '
+				</select>',
+				'class' => 'floatright',
+			),
 		),
 	);
 
diff --git a/Themes/default/css/index.css b/Themes/default/css/index.css
index e488c35dad..85c76b5676 100644
--- a/Themes/default/css/index.css
+++ b/Themes/default/css/index.css
@@ -1441,7 +1441,8 @@ ul li.greeting {
 #display_jump_to_select,
 #message_index_jump_to_select,
 #search_jump_to_select,
-#quick_mod_jump_to_select {
+#quick_mod_jump_to_select,
+#list_integration_hooks select {
 	width: 29ch;
 	overflow: hidden;
 }