diff --git a/gtk2_ardour/big_transport_window.cc b/gtk2_ardour/big_transport_window.cc
index ce56ed90c9..4dcb9b0731 100644
--- a/gtk2_ardour/big_transport_window.cc
+++ b/gtk2_ardour/big_transport_window.cc
@@ -21,6 +21,7 @@
 
 #include "ardour_ui.h"
 #include "big_transport_window.h"
+#include "utils.h"
 
 #include "pbd/i18n.h"
 
@@ -39,3 +40,16 @@ BigTransportWindow::BigTransportWindow ()
 	add (*vbox);
 	vbox->show_all();
 }
+
+void
+BigTransportWindow::on_unmap ()
+{
+	ArdourWindow::on_unmap ();
+	ARDOUR_UI::instance()->reset_focus (this);
+}
+
+bool
+BigTransportWindow::on_key_press_event (GdkEventKey* ev)
+{
+	return ARDOUR_UI_UTILS::relay_key_press (ev, this);
+}
diff --git a/gtk2_ardour/big_transport_window.h b/gtk2_ardour/big_transport_window.h
index ccb125f05e..e5f3b23fb6 100644
--- a/gtk2_ardour/big_transport_window.h
+++ b/gtk2_ardour/big_transport_window.h
@@ -36,6 +36,10 @@ public:
 		transport_ctrl.set_session (s);
 	}
 
+protected:
+	void on_unmap ();
+	bool on_key_press_event (GdkEventKey*);
+
 private:
 	TransportControlUI transport_ctrl;
 };