diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 1087b0e817..ecf269862c 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -2557,6 +2557,7 @@ Editor::set_internal_edit (bool yn)
 	}
 
 	reset_canvas_cursor ();
+	MouseModeChanged ();
 }
 
 /** Update _join_object_range_state which indicate whether we are over the top
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 5616a92cfe..d62fd789ee 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -414,6 +414,10 @@ MidiRegionView::leave_notify (GdkEventCrossing*)
 	trackview.editor().verbose_cursor()->hide ();
 	remove_ghost_note ();
 
+	if (trackview.editor().internal_editing()) {
+		Keyboard::magic_widget_drop_focus();
+	}
+
 	if (pre_enter_cursor) {
 		Editor* editor = dynamic_cast<Editor *> (&trackview.editor());
 		editor->set_canvas_cursor(pre_enter_cursor);