diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 7c128ecd7..6c03d4fdf 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -10145,6 +10145,10 @@ void TrackPanel::OnSetFocus(wxFocusEvent & WXUNUSED(event))
 
 void TrackPanel::OnKillFocus(wxFocusEvent & WXUNUSED(event))
 {
+   if (AudacityProject::HasKeyboardCapture(this))
+   {
+      AudacityProject::ReleaseKeyboard(this);
+   }
    Refresh( false);
 }