diff --git a/zephyr/static/js/hotkey.js b/zephyr/static/js/hotkey.js
index 586da598b0..193f23811e 100644
--- a/zephyr/static/js/hotkey.js
+++ b/zephyr/static/js/hotkey.js
@@ -107,10 +107,8 @@ function process_hotkey(e) {
             ui.hide_userinfo_popover();
         } else if (compose.composing()) {
             compose.cancel();
-        } else if (search.keyboard_currently_finding()) {
-            search.clear_search();
         } else {
-            narrow.deactivate();
+            search.clear_search();
         }
         return true;
     case 99: // 'c': compose
diff --git a/zephyr/static/js/search.js b/zephyr/static/js/search.js
index 58f9bb4ef7..f739347429 100644
--- a/zephyr/static/js/search.js
+++ b/zephyr/static/js/search.js
@@ -337,6 +337,7 @@ exports.initiate_search = function () {
 };
 
 exports.clear_search = function () {
+    narrow.deactivate();
     $('table tr').removeHighlight();
     // Clear & reset searchbox to its normal size
     $('#search_query').val('').width('');