diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 8ad9630b0f..d77c6f7ba5 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4850,12 +4850,14 @@ Editor::get_regions_from_selection_and_mouse (framepos_t pos)
 {
 	RegionSelection regions;
 
-    if (selection->selected (entered_regionview) ) {
-        regions = selection->regions;
+    if (entered_regionview) {
+        if (selection->selected (entered_regionview) ) {
+            regions = selection->regions;
+        }
+        
+        regions.add (entered_regionview);
     }
     
-    regions.add (entered_regionview);
-    
     // Greg Zharun: Waves Tracks PRD does not say this.
     // So let's skip this.
 	//if ( regions.empty() ) {