diff --git a/win32ss/user/winsrv/consrv/init.c b/win32ss/user/winsrv/consrv/init.c
index ab89f7f76e8..eea8cf890f7 100644
--- a/win32ss/user/winsrv/consrv/init.c
+++ b/win32ss/user/winsrv/consrv/init.c
@@ -428,6 +428,9 @@ ConSrvConnect(IN PCSR_PROCESS CsrProcess,
         return STATUS_UNSUCCESSFUL;
     }
 
+    /* Set Control-Dispatcher handler */
+    ProcessData->CtrlRoutine = ConnectInfo->CtrlRoutine;
+
     /* If we don't need a console, then get out of here */
     DPRINT("ConnectInfo->IsConsoleApp = %s\n", ConnectInfo->IsConsoleApp ? "True" : "False");
     if (!ConnectInfo->IsConsoleApp) return STATUS_SUCCESS;
@@ -525,9 +528,8 @@ ConSrvConnect(IN PCSR_PROCESS CsrProcess,
         }
     }
 
-    /* Set the Property-Dialog and Control-Dispatcher handlers */
+    /* Set the Property-Dialog handler */
     ProcessData->PropRoutine = ConnectInfo->PropRoutine;
-    ProcessData->CtrlRoutine = ConnectInfo->CtrlRoutine;
 
     return STATUS_SUCCESS;
 }