diff --git a/src/widgets/valnum.cpp b/src/widgets/valnum.cpp
index e8eaa6e84..20205ec74 100644
--- a/src/widgets/valnum.cpp
+++ b/src/widgets/valnum.cpp
@@ -91,7 +91,12 @@ bool NumValidatorBase::Validate(wxWindow *parent)
     {
         wxMessageBox(errmsg, _("Validation error"),
                      wxOK | wxICON_ERROR, parent);
-        m_validatorWindow->SetFocus();
+        wxTextEntry *te = GetTextEntry();
+        if ( te )
+        {
+            te->SelectAll();
+            te->SetFocus();
+        }
         return false;
     }