diff --git a/lcl/calendar.pp b/lcl/calendar.pp
index c6407eeb34..c12d6f5f55 100644
--- a/lcl/calendar.pp
+++ b/lcl/calendar.pp
@@ -110,6 +110,7 @@ type
   published
     property Align;
     property Anchors;
+    property AutoSize;
     property BorderSpacing;
     property Constraints;
     property Date;
diff --git a/lcl/forms/calendarpopup.lfm b/lcl/forms/calendarpopup.lfm
index 557cf2135d..68f8023c59 100644
--- a/lcl/forms/calendarpopup.lfm
+++ b/lcl/forms/calendarpopup.lfm
@@ -18,6 +18,7 @@ object CalendarPopupForm: TCalendarPopupForm
     Height = 153
     Top = 1
     Width = 162
+    AutoSize = True
     BorderSpacing.Around = 1
     DateTime = 38823
     OnDblClick = CalendarDblClick
diff --git a/lcl/forms/calendarpopup.lrs b/lcl/forms/calendarpopup.lrs
index bbcc5305f3..bc087793f2 100644
--- a/lcl/forms/calendarpopup.lrs
+++ b/lcl/forms/calendarpopup.lrs
@@ -7,7 +7,7 @@ LazarusResources.Add('TCalendarPopupForm','FORMDATA',[
   +#6'bsNone'#7'Caption'#6#17'CalendarPopupForm'#12'ClientHeight'#3#155#0#11'Cl'
   +'ientWidth'#3#164#0#7'OnClose'#7#9'FormClose'#12'OnDeactivate'#7#14'FormDeac'
   +'tivate'#10'LCLVersion'#6#6'0.9.27'#0#9'TCalendar'#8'Calendar'#4'Left'#2#1#6
-  +'Height'#3#153#0#3'Top'#2#1#5'Width'#3#162#0#20'BorderSpacing.Around'#2#1#8
-  +'DateTime'#5#0#0#0#0#0#0#167#151#14'@'#10'OnDblClick'#7#16'CalendarDblClick'
-  +#9'OnKeyDown'#7#15'CalendarKeyDown'#7'TabStop'#9#0#0#0
+  +'Height'#3#153#0#3'Top'#2#1#5'Width'#3#162#0#8'AutoSize'#9#20'BorderSpacing.'
+  +'Around'#2#1#8'DateTime'#5#0#0#0#0#0#0#167#151#14'@'#10'OnDblClick'#7#16'Cal'
+  +'endarDblClick'#9'OnKeyDown'#7#15'CalendarKeyDown'#7'TabStop'#9#0#0#0
 ]);
diff --git a/lcl/forms/calendarpopup.pas b/lcl/forms/calendarpopup.pas
index 0c1e9d263f..d410465caf 100644
--- a/lcl/forms/calendarpopup.pas
+++ b/lcl/forms/calendarpopup.pas
@@ -77,6 +77,7 @@ end;
 procedure TCalendarPopupForm.FormClose(Sender: TObject;
   var CloseAction: TCloseAction);
 begin
+  //DebugLn(['TCalendarPopupForm.FormClose ']);
   FClosed := true;
   CloseAction := caFree;
 end;
@@ -112,7 +113,8 @@ end;
 
 procedure TCalendarPopupForm.FormDeactivate(Sender: TObject);
 begin
-  if not FClosed then
+  //DebugLn(['TCalendarPopupForm.FormDeactivate ',DbgSName(GetCaptureControl)]);
+  if (not FClosed) then
     Close;
 end;