diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc
index d6bd4970cd..7dc9d17805 100644
--- a/gtk2_ardour/step_entry.cc
+++ b/gtk2_ardour/step_entry.cc
@@ -469,7 +469,7 @@ StepEntry::~StepEntry()
 void
 StepEntry::set_step_editor (StepEditor* seditor)
 {
-	if (se) {
+	if (se && se != seditor) {
 		se->step_entry_done ();
 	}