diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 4c2a4c1d6e..043733c3a6 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -362,10 +362,12 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
     m_popup->Hide();
 
     if (!date.IsValid())
-        date.Today();
-
-    SetValue(date);
+        SetValue(wxDateTime::Today());
+    else
+        SetValue(date);
 
+    SetBestFittingSize(size);
+    
     return true;
 }