diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 0d5f75f60d..30e117fb59 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -725,7 +725,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 				if (dynamic_cast<MidiTimeAxisView*> (clicked_axisview)) {
 					_drags->set (new RegionCreateDrag (this, item, clicked_axisview), event);
 					return true;
-				}
+				} 
 			} else {
 				_drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
 				return true;
@@ -879,9 +879,17 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 				break;
 
 			case AutomationTrackItem:
-				/* rubberband drag to select automation points */
-				_drags->set (new RubberbandSelectDrag (this, item), event);
+			{
+				TimeAxisView* parent = clicked_axisview->get_parent ();
+				if (parent && dynamic_cast<MidiTimeAxisView*> (parent)) {
+					/* create a MIDI region so that we have somewhere to put automation */
+					_drags->set (new RegionCreateDrag (this, item, parent), event);
+				} else {
+					/* rubberband drag to select automation points */
+					_drags->set (new RubberbandSelectDrag (this, item), event);
+				}
 				break;
+			}
 
 			case SelectionItem:
 			{