diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index c8a9f85ba3..6a1f2f8589 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -702,6 +702,14 @@ Editor::Editor ()
 	setup_fade_images ();
 
 	switch_editing_context (this);
+	contents().signal_enter_notify_event().connect (sigc::mem_fun (*this, &Editor::enter), false);
+}
+
+bool
+Editor::enter (GdkEventCrossing*)
+{
+	switch_editing_context (this);
+	return false;
 }
 
 Editor::~Editor()
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 6f8f84631b..af2428641a 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -2293,6 +2293,8 @@ private:
 	PBD::Signal<void()> VisibleMarkersChanged;
 	PBD::Signal<void()> VisibleRangesChanged;
 
+	bool enter (GdkEventCrossing*);
+
 	friend class RegionMoveDrag;
 	friend class TrimDrag;
 	friend class MappingTwistDrag;