diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index f0ba5916d7..3b31def60f 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -1728,7 +1728,9 @@ Editor::set_selection_from_region ()
 
 	selection->set (tvl);
 
-	set_mouse_mode (Editing::MouseRange, false);
+	if (!get_smart_mode () || !mouse_mode == Editing::MouseObject) {
+		set_mouse_mode (Editing::MouseRange, false);
+	}
 }
 
 void