diff --git a/docs/changes.txt b/docs/changes.txt
index 5c14a81e9a..b7f0a31924 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -134,6 +134,7 @@ All (GUI):
 - Fixed timing of malformed animated GIFs in wxHTML (Gennady Feller).
 - Fixed incorrect layout width caching in wxHTML (Jeff Tupper).
 - wxHTML: preserve TAB characters when copying <pre> content to clipboard.
+- Set focus to wxCalendarCtrl when it is clicked.
 
 All (Unix):
 
diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index 326e2c35b0..78d960b66e 100644
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -1477,6 +1477,10 @@ void wxCalendarCtrl::OnClick(wxMouseEvent& event)
             event.Skip();
             break;
     }
+
+    // as we don't (always) skip the message, we're not going to receive the
+    // focus on click by default if we don't do it ourselves
+    SetFocus();
 }
 
 wxCalendarHitTestResult wxCalendarCtrl::HitTest(const wxPoint& pos,