diff --git a/components/rx/trunk/languages/rxdconst.uk.po b/components/rx/trunk/languages/rxdconst.uk.po
index b949795cd..df24e6fb7 100644
--- a/components/rx/trunk/languages/rxdconst.uk.po
+++ b/components/rx/trunk/languages/rxdconst.uk.po
@@ -471,6 +471,7 @@ msgid "Optimize column width"
 msgstr "Оптимізувати ширину колонок"
 
 #: rxdconst.srxdbgridselapplycaption
+msgctxt "rxdconst.srxdbgridselapplycaption"
 msgid "Apply"
 msgstr "Застосувати"
 
diff --git a/components/rx/trunk/rxmdi.pas b/components/rx/trunk/rxmdi.pas
index fc1cfe16f..d109ea117 100644
--- a/components/rx/trunk/rxmdi.pas
+++ b/components/rx/trunk/rxmdi.pas
@@ -59,6 +59,8 @@ type
   private
     FMenu:TPopupMenu;
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+  protected
+    procedure Notification(AComponent: TComponent; Operation: TOperation); override;
   public
     constructor CreateButton(AOwner:TRxMDITasks; AForm:TForm);
     procedure Click; override; // make Click public
@@ -130,6 +132,7 @@ type
     procedure SetTaskPanel(AValue: TRxMDITasks);
     function MDIButtonByForm(AForm:TForm):TRxMDIButton;
     procedure HideCurrentWindow;
+    procedure ScreenEventRemoveForm(Sender: TObject; Form: TCustomForm);
   protected
     procedure Notification(AComponent: TComponent; Operation: TOperation); override;
     procedure Loaded; override;
@@ -218,7 +221,7 @@ begin
   begin
     FMDIPanel:=nil;
     OnClick:=nil;
-  end;
+  end
 end;
 
 procedure TRxMDICloseButton.CreateInternalLabel;
@@ -320,6 +323,20 @@ begin
   end;
 end;
 
+procedure TRxMDIPanel.ScreenEventRemoveForm(Sender: TObject; Form: TCustomForm);
+var
+  i: Integer;
+begin
+  if Assigned(FTaskPanel) then
+  begin
+    for i:=0 to FTaskPanel.ComponentCount-1 do
+    begin;
+      if (FTaskPanel.Components[i] is TRxMDIButton) and (TRxMDIButton(FTaskPanel.Components[i]).NavForm = Form) then
+        TRxMDIButton(FTaskPanel.Components[i]).FActiveControl:=nil;
+    end;
+  end;
+end;
+
 procedure TRxMDIPanel.Notification(AComponent: TComponent; Operation: TOperation
   );
 begin
@@ -343,10 +360,13 @@ begin
   Caption:='';
   Align:=alClient;
   BevelOuter:=bvLowered;
+
+  Screen.AddHandlerRemoveForm(@ScreenEventRemoveForm);
 end;
 
 destructor TRxMDIPanel.Destroy;
 begin
+  Screen.RemoveHandlerRemoveForm(@ScreenEventRemoveForm);
   inherited Destroy;
 end;
 
@@ -736,6 +756,14 @@ begin
   Application.ReleaseComponent(Self);
 end;
 
+procedure TRxMDIButton.Notification(AComponent: TComponent;
+  Operation: TOperation);
+begin
+  inherited Notification(AComponent, Operation);
+  if (AComponent = FActiveControl) and (Operation = opRemove) then
+    FActiveControl := nil
+end;
+
 constructor TRxMDIButton.CreateButton(AOwner: TRxMDITasks; AForm: TForm);
 begin
   inherited Create(AOwner);