diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index f3c494d8ac..8148da9f20 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -745,6 +745,11 @@ phpbb.search.navigateResults = function($input, $container, $resultContainer) {
 			$active = $resultContainer.children('.active');
 
 		switch (key) {
+			// Close the results
+			case keymap.ESC:
+				phpbb.search.closeResults($input, $container);
+			break;
+
 			// Set the value for the selected result
 			case keymap.ENTER:
 				if ($active.length) {
@@ -759,11 +764,6 @@ phpbb.search.navigateResults = function($input, $container, $resultContainer) {
 				event.preventDefault();
 			break;
 
-			// Close the results
-			case keymap.ESC:
-				phpbb.search.closeResults($input, $container);
-			break;
-
 			// Navigate the results
 			case keymap.ARROW_DOWN:
 			case keymap.ARROW_UP: