diff --git a/ui/drivers/win32/ui_win32_application.c b/ui/drivers/win32/ui_win32_application.c
index 16ba7b2e1f..df88f2fb05 100644
--- a/ui/drivers/win32/ui_win32_application.c
+++ b/ui/drivers/win32/ui_win32_application.c
@@ -31,15 +31,10 @@ static void* ui_application_win32_initialize(void)
 static void ui_application_win32_process_events(void)
 {
    MSG msg;
-   while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE))
+   while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
    {
-      MSG msg;
-
-      if (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
-      {
-         TranslateMessage(&msg);
-         DispatchMessage (&msg);
-      }
+      TranslateMessage(&msg);
+      DispatchMessage (&msg);
    }
 }