diff --git a/kittens/diff/main.py b/kittens/diff/main.py
index d5c5583be..416c9352d 100644
--- a/kittens/diff/main.py
+++ b/kittens/diff/main.py
@@ -504,6 +504,20 @@ class DiffHandler(Handler):
                         self.state = DIFFED
                     self.draw_status_line()
                     return
+                if key_event.matches('enter'):
+                    self.state = DIFFED
+                    self.do_search()
+                    self.line_edit.clear()
+                    self.draw_screen()
+                    return
+                if key_event.matches('esc'):
+                    self.state = DIFFED
+                    self.draw_status_line()
+                    return
+            if self.state >= DIFFED and self.current_search is not None and key_event.matches('esc'):
+                self.current_search = None
+                self.draw_screen()
+                return
             if key_event.type is EventType.RELEASE:
                 return
         action = self.shortcut_action(key_event)