diff --git a/components/rx/trunk/rxmdi.pas b/components/rx/trunk/rxmdi.pas
index 8cf3c6d16..a9f861e8e 100644
--- a/components/rx/trunk/rxmdi.pas
+++ b/components/rx/trunk/rxmdi.pas
@@ -710,7 +710,11 @@ end;
 
 procedure TRxMDIButton.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  FNavPanel.ChildWindowsShowLast;
+  if (not Assigned(FNavPanel)) or (not Assigned(FNavPanel.FMainPanel)) then
+    exit;
+
+  if FNavPanel.FMainPanel.FCurrentChildWindow = Sender then
+    FNavPanel.ChildWindowsShowLast;
   FNavPanel.ShowHiddenBtnOnResize;
   CloseAction:=caFree;
   Owner.RemoveComponent(Self);