diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 488a998810..9f61d39825 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1539,10 +1539,14 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 		FindAndReplaceOptions opt;
 		istringstream iss(to_utf8(cmd.argument()));
 		iss >> opt;
-		if (findAdv(this, opt))
+		if (findAdv(this, opt)) {
 			dr.screenUpdate(Update::Force | Update::FitCursor);
-		else
+			cur.dispatched();
+			dispatched = true;
+		} else {
+			cur.undispatched();
 			dispatched = false;
+		}
 		break;
 	}