diff --git a/common/dialog_shim.cpp b/common/dialog_shim.cpp
index b0d50ab704..1e9889a9d0 100644
--- a/common/dialog_shim.cpp
+++ b/common/dialog_shim.cpp
@@ -579,6 +579,8 @@ void DIALOG_SHIM::onChildSetFocus( wxFocusEvent& aEvent )
         m_beforeEditValues[ textCtrl ] = textCtrl->GetValue();
     else if( wxStyledTextCtrl* scintilla = dynamic_cast<wxStyledTextCtrl*>( aEvent.GetEventObject() ) )
         m_beforeEditValues[ scintilla ] = scintilla->GetText();
+
+    aEvent.Skip();
 }