diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 5cbe2b7c6a..b31684920c 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3956,6 +3956,10 @@ Editor::transport_punch_location()
 bool
 Editor::control_layout_scroll (GdkEventScroll* ev)
 {
+	if (Keyboard::some_magic_widget_has_focus()) {
+		return false;
+	}
+
 	switch (ev->direction) {
 	case GDK_SCROLL_UP:
 		scroll_tracks_up_line ();
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 577fbcdda6..6429148f4c 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -291,6 +291,10 @@ TimeAxisView::clip_to_viewport ()
 bool
 TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
 {
+	if (Keyboard::some_magic_widget_has_focus()) {
+		return false;
+	}
+
 	switch (ev->direction) {
 	case GDK_SCROLL_UP:
 		if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {