diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index 96c65c664..f73fa91d1 100644
--- a/src/editor/editcmd.c
+++ b/src/editor/editcmd.c
@@ -1046,10 +1046,8 @@ edit_do_search (WEdit * edit)
         search_create_bookmark = FALSE;
         book_mark_flush (edit, -1);
 
-        while (TRUE)
+        while (mc_search_run (edit->search, (void *) edit, q, edit->last_byte, &len))
         {
-            if (!mc_search_run (edit->search, (void *) edit, q, edit->last_byte, &len))
-                break;
             if (found == 0)
                 edit->search_start = edit->search->normal_offset;
             found++;