diff --git a/programs/games/freecell/MACROS.INC b/programs/games/freecell/MACROS.INC
deleted file mode 100644
index 14185dbfce..0000000000
--- a/programs/games/freecell/MACROS.INC
+++ /dev/null
@@ -1,269 +0,0 @@
-; new application structure
-macro meos_app_start
- {
-  use32
-  org 0x0
-
-  db 'MENUET01'
-  dd 0x01
-  dd __start
-  dd __end
-  dd __memory
-  dd __stack
-
-  if used __params & ~defined __params
-    dd __params
-  else
-    dd 0x0
-  end if
-
-  dd 0x0
- }
-MEOS_APP_START fix meos_app_start
-
-macro code
- {
-  __start:
- }
-CODE fix code
-
-macro data
- {
-  __data:
- }
-DATA fix data
-
-macro udata
- {
-  if used __params & ~defined __params
-    __params:
-      db 0
-    __end:
-      rb 255
-  else
-    __end:
-  end if
-  __udata:
- }
-UDATA fix udata
-
-macro meos_app_end
- {
-  align 32
-  rb 2048
-  __stack:
-  __memory:
- }
-MEOS_APP_END fix meos_app_end
-
-
-; macro for defining multiline text data
-struc mstr [sstring]
- {
-  forward
-    local ssize
-    virtual at 0
-      db sstring
-      ssize = $
-    end virtual
-    dd ssize
-    db sstring
-  common
-    dd -1
- }
-
-
-; strings
-macro sz name,[data] {       ; from MFAR [mike.dld]
-  common
-   if used name
-    label name
-   end if
-  forward
-   if used name
-    db data
-   end if
-  common
-   if used name
-    .size = $-name
-   end if
-}
-
-macro lsz name,[lng,data] {  ; from MFAR [mike.dld]
-  common
-   if used name
-    label name
-   end if
-  forward
-   if (used name)&(lang eq lng)
-    db data
-   end if
-  common
-   if used name
-    .size = $-name
-   end if
-}
-
-
-
-; easy system call macro
-macro mpack dest, hsrc, lsrc
-{
-  if (hsrc eqtype 0) & (lsrc eqtype 0)
-    mov dest, (hsrc) shl 16 + lsrc
-  else
-    if (hsrc eqtype 0) & (~lsrc eqtype 0)
-      mov dest, (hsrc) shl 16
-      add dest, lsrc
-    else
-      mov dest, hsrc
-      shl dest, 16
-      add dest, lsrc
-    end if
-  end if
-}
-
-macro __mov reg,a,b {         ; mike.dld
- if (~a eq)&(~b eq)
-   mpack reg,a,b
- else if (~a eq)&(b eq)
-   mov reg,a
- end if
-}
-
-macro mcall a,b,c,d,e,f {   ; mike.dld
- __mov eax,a
- __mov ebx,b
- __mov ecx,c
- __mov edx,d
- __mov esi,e
- __mov edi,f
- int   0x40
-}
-
-
-
-; optimize the code for size
-__regs fix <eax,ebx,ecx,edx,esi,edi,ebp,esp>
-
-macro add arg1,arg2
- {
-   if (arg2 eqtype 0)
-      if (arg2) = 1
-         inc arg1
-      else
-         add arg1,arg2
-      end if
-   else
-      add arg1,arg2
-   end if
- }
-
-macro sub arg1,arg2
- {
-   if (arg2 eqtype 0)
-      if (arg2) = 1
-         dec arg1
-      else
-         sub arg1,arg2
-      end if
-   else
-      sub arg1,arg2
-   end if
- }
-
-macro mov arg1,arg2
- {
-   if (arg1 in __regs) & ((arg2 eqtype 0) | (arg2 eqtype '0'))
-      if (arg2) = 0
-         xor arg1,arg1
-      else if (arg2) = 1
-         xor arg1,arg1
-         inc arg1
-      else if (arg2) = -1
-         or  arg1,-1
-      else if (arg2) > -128 & (arg2) < 128
-         push arg2
-         pop  arg1
-      else
-         mov  arg1,arg2
-      end if
-   else
-      mov arg1,arg2
-   end if
- }
-
-
-macro struct name
- {
-  virtual at 0
-   name name
-   sizeof.#name = $ - name
-  end virtual
- }
-
-; structures used in MeOS
-struc process_information
- {
-  .cpu_usage               dd ?  ; +0
-  .window_stack_position   dw ?  ; +4
-  .window_stack_value      dw ?  ; +6
-  .not_used1               dw ?  ; +8
-  .process_name            rb 12 ; +10
-  .memory_start            dd ?  ; +22
-  .used_memory             dd ?  ; +26
-  .PID                     dd ?  ; +30
-  .x_start                 dd ?  ; +34
-  .y_start                 dd ?  ; +38
-  .x_size                  dd ?  ; +42
-  .y_size                  dd ?  ; +46
-  .slot_state              dw ?  ; +50
-                           dw ?  ; +52 - reserved
-  .client_left             dd ?  ; +54
-  .client_top              dd ?  ; +58
-  .client_width            dd ?  ; +62
-  .client_height           dd ?  ; +66
-  .wnd_state               db ?  ; +70
-  rb (1024-71)
- }
-struct process_information
-
-struc system_colors
- {
-  .frame            dd ?
-  .grab             dd ?
-  .grab_button      dd ?
-  .grab_button_text dd ?
-  .grab_text        dd ?
-  .work             dd ?
-  .work_button      dd ?
-  .work_button_text dd ?
-  .work_text        dd ?
-  .work_graph       dd ?
- }
-struct system_colors
-
-
-; constants
-
-; events
-EV_IDLE        = 0
-EV_TIMER       = 0
-EV_REDRAW      = 1
-EV_KEY         = 2
-EV_BUTTON      = 3
-EV_EXIT        = 4
-EV_BACKGROUND  = 5
-EV_MOUSE       = 6
-EV_IPC         = 7
-EV_STACK       = 8
-
-; event mask bits for function 40
-EVM_REDRAW     =        1b
-EVM_KEY        =       10b
-EVM_BUTTON     =      100b
-EVM_EXIT       =     1000b
-EVM_BACKGROUND =    10000b
-EVM_MOUSE      =   100000b
-EVM_IPC        =  1000000b
-EVM_STACK      = 10000000b
\ No newline at end of file
diff --git a/programs/games/freecell/freecell.ASM b/programs/games/freecell/freecell.asm
similarity index 95%
rename from programs/games/freecell/freecell.ASM
rename to programs/games/freecell/freecell.asm
index 6dabf797b5..3ea492901f 100644
--- a/programs/games/freecell/freecell.ASM
+++ b/programs/games/freecell/freecell.asm
@@ -7,7 +7,7 @@
 ; e-mail:       gorsash@mail.ru
 
 
-include "macros.inc"
+include "../../macros.inc"
 include "lang.inc"
 meos_app_start
 
@@ -616,6 +616,9 @@ code
     mov     ecx, -1          ; we want to know info of our window
     mcall
 
+    test    [process_info.wnd_state], 0x04
+    jnz     draw_window.end_draw
+
 
     mov     eax, [process_info.box.height]
     mov     [WindowHeight], ax
@@ -968,7 +971,7 @@ code
 
 
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
+    draw_window.end_draw:
 
     mov     eax, 12          ; finish drawing
     mov     ebx, 2
@@ -2105,4 +2108,4 @@ udata
   topbuttonsbarheight = 20
 
 
-meos_app_end
\ No newline at end of file
+meos_app_end