diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 47b42eb0aa..f784faf888 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1239,10 +1239,6 @@ Editor::generic_event_handler (GdkEvent* ev)
 		case GDK_NOTIFY_VIRTUAL:
 		case GDK_NOTIFY_NONLINEAR:
 		case GDK_NOTIFY_NONLINEAR_VIRTUAL:
-			/* leaving window, so reset focus, thus ending any and
-			   all text entry operations.
-			*/
-			reset_focus();
 			break;
 		}
 		break;
diff --git a/gtk2_ardour/panner_interface.cc b/gtk2_ardour/panner_interface.cc
index 72759b89c8..33d6cd1429 100644
--- a/gtk2_ardour/panner_interface.cc
+++ b/gtk2_ardour/panner_interface.cc
@@ -100,7 +100,6 @@ PannerInterface::~PannerInterface ()
 bool
 PannerInterface::on_enter_notify_event (GdkEventCrossing *)
 {
-	grab_focus ();
 	Keyboard::magic_widget_grab_focus ();
 	return false;
 }