diff --git a/components/rx/rxmdi.pas b/components/rx/rxmdi.pas
index 52c9384e9..fbab20eb7 100644
--- a/components/rx/rxmdi.pas
+++ b/components/rx/rxmdi.pas
@@ -116,6 +116,7 @@ type
     procedure SetTaskPanel(AValue: TRxMDITasks);
   protected
     procedure Notification(AComponent: TComponent; Operation: TOperation); override;
+    procedure Loaded; override;
   public
     constructor Create(TheOwner: TComponent); override;
     procedure ShowWindow(F:TForm);
@@ -278,6 +279,12 @@ begin
     FTaskPanel:=nil;
 end;
 
+procedure TRxMDIPanel.Loaded;
+begin
+  inherited Loaded;
+  CurrentChildWindow:=nil;
+end;
+
 constructor TRxMDIPanel.Create(TheOwner: TComponent);
 begin
   inherited Create(TheOwner);