diff --git a/reactos/dll/win32/syssetup/wizard.c b/reactos/dll/win32/syssetup/wizard.c
index 57e5f661eb9..3ce24ba54b8 100644
--- a/reactos/dll/win32/syssetup/wizard.c
+++ b/reactos/dll/win32/syssetup/wizard.c
@@ -858,7 +858,7 @@ SetKeyboardLayoutName(HWND hwnd)
 static BOOL
 RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters)
 {
-	MSG msg;
+    MSG msg;
     if (pwszCPLParameters)
     {
         STARTUPINFOW StartupInfo;
@@ -888,10 +888,10 @@ RunControlPanelApplet(HWND hwnd, PCWSTR pwszCPLParameters)
 
         while((MsgWaitForMultipleObjects(1, ProcessInformation.hProcess, FALSE, INFINITE, QS_ALLINPUT|QS_ALLPOSTMESSAGE )) != WAIT_OBJECT_0)
         { 
-           while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+           while(PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE))
            {
                TranslateMessage(&msg);
-               DispatchMessage(&msg);
+               DispatchMessageW(&msg);
            }
         }
         CloseHandle(ProcessInformation.hThread);