diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 1b87a3d444..304b8508c6 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -365,12 +365,11 @@ relay_key_press (GdkEventKey* ev, Gtk::Window* win)
 {
 	PublicEditor& ed (PublicEditor::instance());
 
-	if (&ed == 0) {
-		/* early key press in pre-main-window-dialogs, no editor yet */
-		return false;
-	}
-
 	if (!key_press_focus_accelerator_handler (*win, ev)) {
+		if (&ed == 0) {
+			/* early key press in pre-main-window-dialogs, no editor yet */
+			return false;
+		}
 		return ed.on_key_press_event(ev);
 	} else {
 		return true;