diff --git a/kernel/trunk/gui/event.inc b/kernel/trunk/gui/event.inc
index 8be2f68ea0..0610cd5220 100644
--- a/kernel/trunk/gui/event.inc
+++ b/kernel/trunk/gui/event.inc
@@ -368,13 +368,13 @@ sys_sendwindowmsg:                                 ;; f72
         cli
         sub     ecx,2
         je      .sendkey
-        dec     ecx
+        dec     ecx
         jnz     .retf
 .sendbtn:
         cmp     byte[BTN_COUNT],1
         jae     .result ;overflow
         inc     byte[BTN_COUNT]
-        shl     edx, 8
+        shl     edx, 8
         mov     [BTN_BUFF],edx
         jmp     .result
 .sendkey:
@@ -455,6 +455,15 @@ get_event_for_app:                                 ;; used from f10,f11,f23
         je      .loop          ; empty ???
         ret     ; retval = eax
 .FlagAutoReset: ; retvals: BgrRedraw=5, Mouse=6, IPC=7, Stack=8, Debug=9
+        cmp     eax,5 ; Mouse 5+1=6
+        jne     @f
+        push    eax
+; If the window is captured and moved by the user, then no mouse events!!!
+        mov     al, [mouse.active_sys_window.action]
+        test    al, mouse.WINDOW_MOVE_FLAG
+        pop     eax
+        jnz     .loop
+@@:
         btr     [ebx+APPDATA.event_mask],eax
         jnc     .loop
   .result:      ; retval = eax+1
@@ -469,8 +478,8 @@ get_event_for_app:                                 ;; used from f10,f11,f23
         je      .loop          ; empty ???
         cmp     edx,[TASK_COUNT]
         jne     .loop          ; not Top ???
-        mov     edx, [BTN_BUFF]
-        shr     edx, 8
+        mov     edx, [BTN_BUFF]
+        shr     edx, 8
         cmp     edx, 0xFFFF    ;-ID for Minimize-Button of Form
         jne     .result
         mov     [window_minimize],1