diff --git a/src/generic/timectrlg.cpp b/src/generic/timectrlg.cpp
index 1363bfdd5c..2435eb9547 100644
--- a/src/generic/timectrlg.cpp
+++ b/src/generic/timectrlg.cpp
@@ -156,7 +156,7 @@ private:
     // Event handlers for various events in our controls.
     void OnTextSetFocus(wxFocusEvent& event)
     {
-        HighlightCurrentField();
+        CallAfter(&wxTimePickerGenericImpl::HighlightCurrentField);
 
         event.Skip();
     }
@@ -303,6 +303,7 @@ private:
         }
 
         ChangeCurrentField(field);
+        CallAfter(&wxTimePickerGenericImpl::HighlightCurrentField);
     }
 
     void OnArrowUp(wxSpinEvent& WXUNUSED(event))