diff --git a/app/client/ui2018/search.ts b/app/client/ui2018/search.ts
index 8e2c5c3e..7ca7e7c7 100644
--- a/app/client/ui2018/search.ts
+++ b/app/client/ui2018/search.ts
@@ -144,7 +144,7 @@ export function searchBar(model: SearchModel, testId: TestId = noTestId) {
     )),
     dom.onKeyDown({
       Enter: () => model.findNext(),
-      Escape: () => toggleMenu(false),
+      Escape: () => { keepExpanded = false; toggleMenu(false); },
       // Catch both Tab and Shift+Tab to prevent focus entering unrelated editable label.
       Tab: () => toggleMenu(false),
     }),