diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 5071ebd36a..4d6a0a72d5 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -391,8 +391,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 		keyboard->set_state (*node, Stateful::loading_state_version);
 	}
 
-	keyboard->GrabFocus.connect (sigc::mem_fun (*this, &ARDOUR_UI::grab_focus_after_dialog));
-
 	/* we don't like certain modifiers */
 	Bindings::set_ignored_state (GDK_LOCK_MASK|GDK_MOD2_MASK|GDK_MOD3_MASK);
 
@@ -5070,13 +5068,3 @@ ARDOUR_UI::cancel_solo ()
 		_session->clear_all_solo_state (_session->get_routes()); // safeguard, ideally this won't do anything, check the log-window
 	}
 }
-
-void
-ARDOUR_UI::grab_focus_after_dialog ()
-{
-	if (mixer && mixer->fully_visible()) {
-		mixer->grab_focus ();
-	} else if (editor) {
-		editor->grab_focus ();
-	}
-}
diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
index 7bdfab3007..4319c9a4f6 100644
--- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h
+++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
@@ -179,7 +179,6 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful
 	};
 
 	sigc::signal0<void> ZoomVerticalModifierReleased;
-	sigc::signal0<void> GrabFocus;
 
   protected:
 	static Keyboard* _the_keyboard;