diff --git a/programs/network/vncc/gui.inc b/programs/network/vncc/gui.inc
index 11c5f81873..5dcc430ad8 100644
--- a/programs/network/vncc/gui.inc
+++ b/programs/network/vncc/gui.inc
@@ -163,7 +163,7 @@ draw_gui:
         test    [work], WORK_GUI
         jnz     .redraw
         cmp     [status], STATUS_CONNECTED
-        je      .connected
+        je      connected
 
         mcall   23, 10                          ; wait for event
         dec     eax                             ; redraw request ?
@@ -176,8 +176,6 @@ draw_gui:
         jz      .mouse
         jmp     .loop
 
-  .connected:
-        ret
 
   .key:                                         ; key event handler
         mcall   2                               ; read key
diff --git a/programs/network/vncc/vncc.asm b/programs/network/vncc/vncc.asm
index 2bc9462daa..68dfbf2aab 100644
--- a/programs/network/vncc/vncc.asm
+++ b/programs/network/vncc/vncc.asm
@@ -195,9 +195,10 @@ end if
   @@:
 
 ; Present the user with the GUI and wait for network connection
-        call    draw_gui.first_time
+        jmp     draw_gui.first_time
 
 ; Create main window
+connected:
         mcall   71, 1, name             ; reset window caption (add server name)
 
         mov     edx, dword[screen]
@@ -207,7 +208,7 @@ end if
         add     esi, ypos+xpos
         mcall   67, 10, 10              ; resize the window
 
-        mcall   40, EVM_MOUSE + EVM_MOUSE_FILTER + EVM_KEY + EVM_REDRAW + EVM_BUTTON
+        mcall   40, EVM_CURSOR_FILTER + EVM_MOUSE_FILTER + EVM_MOUSE + EVM_KEY + EVM_REDRAW + EVM_BUTTON
 
         mcall   66, 1, 1                ; Switch keyboard to scancode mode