diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 89a42747a..5e0ad3ee8 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -49,6 +49,8 @@ Changed
 - Using `:download` now uses the page's title as filename.
 - Using `:back` or `:forward` with a count now skips intermediate pages.
 - When there are multiple messages shown, the timeout is increased.
+- `:search` now only clears the search if one was displayed before, so pressing
+  `<Escape>` doesn't un-focus inputs anymore.
 
 Fixes
 ~~~~~
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 8b6a688c1..b3e9c37bf 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1744,7 +1744,8 @@ class CommandDispatcher:
         """
         self.set_mark("'")
         tab = self._current_widget()
-        tab.search.clear()
+        if tab.search.search_displayed:
+            tab.search.clear()
 
         if not text:
             return