Index: midi_region_view.cc
===================================================================
--- midi_region_view.cc	(revision 11491)
+++ midi_region_view.cc	(working copy)
@@ -330,7 +330,13 @@
 	}
 
 	if (ev->type == GDK_2BUTTON_PRESS) {
-		return trackview.editor().toggle_internal_editing_from_double_click (ev);
+		// cannot use double-click to exit internal mode if single-click is being used
+		MouseMode m = trackview.editor().current_mouse_mode();
+
+		if ((m != MouseObject || !Keyboard::modifier_state_contains (ev->button.state, Keyboard::insert_note_modifier())) &&
+			(m != MouseDraw)) {
+				return trackview.editor().toggle_internal_editing_from_double_click (ev);
+		}
 	}
 
 	if (!trackview.editor().internal_editing()) {