diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp
index a1d1e099c5..9620349397 100644
--- a/cvpcb/cvpcb_mainframe.cpp
+++ b/cvpcb/cvpcb_mainframe.cpp
@@ -811,8 +811,12 @@ void CVPCB_MAINFRAME::CreateScreenCmp()
         // So we want to put it to front, second after our CVPCB_MAINFRAME.
         // We do this by a little dance of bringing it to front then the main
         // frame back.
+        wxWindow* focus = FindFocus();
+
         fpframe->Raise();   // Make sure that is visible.
         Raise();            // .. but still we want the focus.
+
+        focus->SetFocus();
     }
 
     fpframe->InitDisplay();