diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 0640898abd..4eb68af948 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2458,6 +2458,7 @@ void BufferView::setCursor(DocIterator const & dit)
 
 	d->cursor_.setCursor(dit);
 	d->cursor_.setSelection(false);
+	d->cursor_.setCurrentFont();
 	// FIXME
 	// It seems on general grounds as if this is probably needed, but
 	// it is not yet clear.
diff --git a/status.21x b/status.21x
index afb9326bad..1aaca2e5ea 100644
--- a/status.21x
+++ b/status.21x
@@ -73,6 +73,8 @@ What's new
 
 - Reset cursor font when leaving an inset to the left (bug 6032).
 
+- Reset cursor font when navigating with find or spellcheck (bug 9500).
+
 - Correctly update previews when cursor leaves inset (bug 6173).