diff --git a/src/frontends/controllers/ControlSpellchecker.cpp b/src/frontends/controllers/ControlSpellchecker.cpp
index e62bb01959..edc2aa2d84 100644
--- a/src/frontends/controllers/ControlSpellchecker.cpp
+++ b/src/frontends/controllers/ControlSpellchecker.cpp
@@ -219,6 +219,11 @@ void ControlSpellchecker::check()
 
 		// end of document
 		if (getWord().empty()) {
+			// FIXME: if we used a lfun like in find/replace, dispatch
+			// would do that for us
+			kernel().bufferview()->update();
+			// FIXME: this Controller is very badly designed...
+			kernel().lyxview().currentWorkArea()->redraw();
 			showSummary();
 			exitEarly_ = true;
 			return;
diff --git a/status.15x b/status.15x
index 67d6f873fc..83bd08c925 100644
--- a/status.15x
+++ b/status.15x
@@ -96,6 +96,9 @@ What's new
 
 - Really highlight search text (bug 3999).
 
+- Fix bug where the spellchecker didn't update the screen display on the last of
+  several misspelt words (bug 3586).
+
 
 * DOCUMENTATION