diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index eee60e0..06cd719 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -855,6 +855,10 @@ Editor::catch_vanishing_regionview (RegionView *rv)
 	   audioregionview by itself.
 	*/
 
+	if (rv->get_canvas_group() == drag_info.item) {
+		end_grab (drag_info.item, 0);
+	}
+
 	if (clicked_regionview == rv) {
 		clicked_regionview = 0;
 	}
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 4228bcb..b870ea3 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1983,9 +1983,9 @@ Editor::end_grab (ArdourCanvas::Item* item, GdkEvent* event)
 		return false;
 	}
 	
-	drag_info.item->ungrab (event->button.time);
+	drag_info.item->ungrab (event ? event->button.time : 0);
 
-	if (drag_info.finished_callback) {
+	if (drag_info.finished_callback && event) {
 		drag_info.last_pointer_x = drag_info.current_pointer_x;
 		drag_info.last_pointer_y = drag_info.current_pointer_y;
 		(this->*(drag_info.finished_callback)) (item, event);