diff --git a/components/rx/rxlookup.pas b/components/rx/rxlookup.pas
index 8b0ee4309..24cb94170 100644
--- a/components/rx/rxlookup.pas
+++ b/components/rx/rxlookup.pas
@@ -230,9 +230,10 @@ type
     procedure UpdateData;
     procedure NeedUpdateData;
   protected
+    procedure CalculatePreferredSize(var PreferredWidth, PreferredHeight: integer;
+                                     WithThemeSpace: Boolean); override;
     procedure ShowList; virtual;
     procedure OnClosePopup(AResult:boolean);virtual;
-    procedure DoAutoSize; override;
     procedure SetEnabled(Value: Boolean); override;
     procedure KeyDown(var Key: Word; Shift: TShiftState); override;
     procedure KeyPress(var Key: char); override;
@@ -1118,6 +1119,24 @@ begin
   end;
 end;
 
+procedure TRxCustomDBLookupCombo.CalculatePreferredSize(var PreferredWidth,
+  PreferredHeight: integer; WithThemeSpace: Boolean);
+var
+  tmpCanvas: TCanvas;
+begin
+  inherited CalculatePreferredSize(PreferredWidth, PreferredHeight,
+    WithThemeSpace);
+  // ignore width
+  PreferredWidth:=0;
+  tmpCanvas := GetWorkingCanvas(Canvas);
+  try
+    PreferredHeight:=Canvas.TextHeight('Wg')+12;
+  finally
+    if TmpCanvas<>Canvas then
+      FreeWorkingCanvas(tmpCanvas);
+  end;
+end;
+
 procedure TRxCustomDBLookupCombo.OnClosePopup(AResult: boolean);
 begin
   if Assigned(FRxPopUpForm) and AResult and (pfgColumnResize in FPopUpFormOptions.Options) then
@@ -1151,11 +1170,6 @@ begin
     FOnSelect(Self);
 end;
 
-procedure TRxCustomDBLookupCombo.DoAutoSize;
-begin
-  Height:=Canvas.TextHeight('Wg')+12;
-end;
-
 procedure TRxCustomDBLookupCombo.SetEnabled(Value: Boolean);
 begin
   inherited SetEnabled(Value);
diff --git a/components/rx/tooledit.pas b/components/rx/tooledit.pas
index 5f8ff29c9..9971ed070 100644
--- a/components/rx/tooledit.pas
+++ b/components/rx/tooledit.pas
@@ -787,6 +787,7 @@ begin
     FPopup := CreatePopupCalendar(Self {$IFDEF USED_BiDi}, BiDiMode {$ENDIF});
     FPopup.OnCloseUp := @PopupCloseUp;
     FPopup.Color := FPopupColor;
+    FPopup.Visible:=false;
 {$ELSE}
     FPopup:=nil;
 {$ENDIF DEFAULT_POPUP_CALENDAR}