diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 4ed2639b78..5c5719bb39 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -122,13 +122,17 @@ PluginUIWindow::~PluginUIWindow ()
 bool
 PluginUIWindow::on_key_press_event (GdkEventKey* event)
 {
-	return PublicEditor::instance().on_key_press_event(event);
+	if (!key_press_focus_accelerator_handler (*this, event)) {
+		return PublicEditor::instance().on_key_press_event(event);
+	} else {
+		return true;
+	}
 }
 
 bool
 PluginUIWindow::on_key_release_event (GdkEventKey* event)
 {
-	return PublicEditor::instance().on_key_release_event(event);
+	return true;
 }
 
 void