diff --git a/lisp/isearch.el b/lisp/isearch.el
index 45c6d97dd36..62899ab8298 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1184,8 +1184,8 @@ nonincremental search instead via `isearch-edit-string'."
   (if (and search-nonincremental-instead
 	   (= 0 (length isearch-string)))
       (let ((isearch-nonincremental t))
-	(isearch-edit-string)))
-  (isearch-done)
+	(isearch-edit-string)) ;; this calls isearch-done as well
+    (isearch-done))
   (isearch-clean-overlays))
 
 (defun isearch-fail-pos (&optional msg)