diff --git a/ChangeLog.txt b/ChangeLog.txt
index 18774809ad..797769d1ff 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,10 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-11-08 17:06 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/rtl/gtxwc/gtxwc.c
+    ! protection agains switching [x] button before window is open
+
 2013-11-08 16:50 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/gtqtc/gtqtc.h
     ! typo in variable type
diff --git a/src/rtl/gtxwc/gtxwc.c b/src/rtl/gtxwc/gtxwc.c
index 0b562d4d98..95a56f0b21 100644
--- a/src/rtl/gtxwc/gtxwc.c
+++ b/src/rtl/gtxwc/gtxwc.c
@@ -5128,7 +5128,7 @@ static HB_BOOL hb_gt_xwc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
             iVal = hb_itemGetNI( pInfo->pNewVal );
             if( iVal >= 0 && iVal <= 2 && wnd->iCloseMode != iVal )
             {
-               if( iVal == 2 || wnd->iCloseMode == 2 )
+               if( iVal == 2 || wnd->iCloseMode == 2 && wnd->fInit )
                   hb_gt_xwc_CloseButton( wnd, iVal < 2 );
                wnd->iCloseMode = iVal;
             }