diff --git a/comp/src/gb.form.mdi/.component b/comp/src/gb.form.mdi/.component
index cecd1794b..a6ab792d4 100644
--- a/comp/src/gb.form.mdi/.component
+++ b/comp/src/gb.form.mdi/.component
@@ -1,6 +1,6 @@
 [Component]
 Key=gb.form.mdi
-Version=3.18.0
+Version=3.18.90
 Authors=Benoît Minisini
 Needs=Form
 Requires=gb.form,gb.settings
diff --git a/comp/src/gb.form.mdi/.project b/comp/src/gb.form.mdi/.project
index ae8e7ff63..60f7c2ab0 100644
--- a/comp/src/gb.form.mdi/.project
+++ b/comp/src/gb.form.mdi/.project
@@ -2,7 +2,7 @@
 Title=Multiple document interface management
 Startup=FMain
 Icon=.hidden/control/workspace.png
-Version=3.18.0
+Version=3.18.90
 VersionFile=1
 Component=gb.image
 Component=gb.gui
diff --git a/comp/src/gb.form.mdi/.src/ToolBar/FToolBar.class b/comp/src/gb.form.mdi/.src/ToolBar/FToolBar.class
index 47e9fa726..71ed9ae09 100644
--- a/comp/src/gb.form.mdi/.src/ToolBar/FToolBar.class
+++ b/comp/src/gb.form.mdi/.src/ToolBar/FToolBar.class
@@ -398,8 +398,6 @@ Private Sub Update()
   
   'dwgHandle.Refresh
   
-  $bLock = False
-
   If sepToolbar.Visible Then 
     If $bReallyVertical Then
       Inc W
@@ -416,6 +414,8 @@ Private Sub Update()
     Me.Parent.Resize(W, H)
   Endif
   
+  $bLock = False
+
   SetArrangement
   
 End
@@ -426,20 +426,20 @@ Public Sub TimerUpdate_Timer()
   
 End
 
-
 Public Sub Form_Resize()
   
+  If $bLock Then Return
   $hTimerUpdate.Trigger
   
 End
  
 Public Sub Container_Arrange()
   
+  If $bLock Then Return
   $hTimerUpdate.Trigger
   
 End
 
-
 Public Sub panToolbar_BeforeArrange()
 
   If $bDesign Then Return