diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp
index b1bd2b298..bd144ac34 100644
--- a/src/commands/CommandManager.cpp
+++ b/src/commands/CommandManager.cpp
@@ -89,6 +89,7 @@ CommandManager.  It holds the callback for one command.
 #include "../AudacityException.h"
 #include "../Prefs.h"
 #include "../Project.h"
+#include "../Lyrics.h"
 
 #include "Keyboard.h"
 #include "../PluginManager.h"
@@ -1380,9 +1381,9 @@ bool CommandManager::FilterKeyEvent(AudacityProject *project, const wxKeyEvent &
       wxWindow * pWnd = wxWindow::FindFocus();
       wxWindow * pTrackPanel = (wxWindow*)GetActiveProject()->GetTrackPanel();
       bool bIntercept = pWnd !=  pTrackPanel;
-      // Intercept keys from windows that are NOT panels
+      // Intercept keys from windows that are NOT the Lyrics panel
       if( bIntercept ){
-         bIntercept = pWnd && ( dynamic_cast<wxPanel*>(pWnd) == NULL );
+         bIntercept = pWnd && ( dynamic_cast<Lyrics*>(pWnd) == NULL );
       }
       //wxLogDebug("Focus: %p TrackPanel: %p", pWnd, pTrackPanel );
       // We allow the keystrokes below to be handled by wxWidgets controls IF we are