diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index b3b18ce909..8d4212af0b 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1875,8 +1875,18 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 			break;
 
 		case MouseDraw:
+			if (item_type == NoteItem) {
+				remove_midi_note (item, event);
+			}
 			return true;
 
+		case MouseContent:
+			if (item_type == NoteItem) {
+				remove_midi_note (item, event);
+				return true;
+			}
+			break;
+
 		case MouseRange:
 			// x_style_paste (where, 1.0);
 			return true;
@@ -1885,7 +1895,6 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 		default:
 			break;
 		}
-
 		break;
 
 	case 3: