diff --git a/components/rx/trunk/tooledit.pas b/components/rx/trunk/tooledit.pas
index e0bb8d5b7..52f3b6618 100644
--- a/components/rx/trunk/tooledit.pas
+++ b/components/rx/trunk/tooledit.pas
@@ -116,6 +116,7 @@ type
 
     function GetDefaultGlyphName: String; override;
     function CreatePopupForm:TPopupCalendar;
+    procedure DoEnter; override;
 
     property BlanksChar: Char read FBlanksChar write SetBlanksChar default ' ';
     property DialogTitle:TCaption Read FDialogTitle Write FDialogTitle Stored IsStoreTitle;
@@ -867,6 +868,12 @@ begin
   TRxCalendarGrid(Result.Calendar).NotInThisMonthColor:=FNotInThisMonthColor;
 end;
 
+procedure TCustomRxDateEdit.DoEnter;
+begin
+  if Enabled then
+    inherited DoEnter;
+end;
+
 constructor TCustomRxDateEdit.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);