diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 9095152f77..9750f58e9d 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4596,6 +4596,8 @@ Editor::pre_render ()
 int
 Editor::idle_visual_changer ()
 {
+	pending_visual_change.idle_handler_id = -1;
+
 	if (pending_visual_change.pending == 0) {
 		return 0;
 	}
@@ -4610,8 +4612,6 @@ Editor::idle_visual_changer ()
 	   the last one.
 	*/
 
-	pending_visual_change.idle_handler_id = -1;
-
 	if (visual_change_queued) {
 		return 0;
 	}