diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index b5450a2e86..1f3ac61fb5 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -1225,7 +1225,9 @@ AudioClock::on_focus_out_event (GdkEventFocus* ev)
 {
 	bool ret = CairoWidget::on_focus_out_event (ev);
 
-	end_edit (false);
+	if (editing) {
+		end_edit (false);
+	}
 
 	return ret;
 }