diff --git a/common/dialog_shim.cpp b/common/dialog_shim.cpp
index de2296f3de..8cc6297e2a 100644
--- a/common/dialog_shim.cpp
+++ b/common/dialog_shim.cpp
@@ -285,6 +285,9 @@ bool DIALOG_SHIM::Show( bool show )
         ret = wxDialog::Show( show );
     }
 
+    if( m_parent )
+        m_parent->SetFocus();
+
     return ret;
 }
 
@@ -486,6 +489,9 @@ int DIALOG_SHIM::ShowQuasiModal()
 
     m_qmodal_showing = false;
 
+    if( parent )
+        parent->SetFocus();
+
     return GetReturnCode();
 }