diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c
index c3751517527..8f15a68e1bf 100644
--- a/win32ss/user/ntuser/display.c
+++ b/win32ss/user/ntuser/display.c
@@ -412,36 +412,27 @@ UserEnumDisplaySettings(
     PGRAPHICS_DEVICE pGraphicsDevice;
     PDEVMODEENTRY pdmentry;
     ULONG i, iFoundMode;
+    PPDEVOBJ ppdev;
 
     TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n",
           pustrDevice, iModeNum);
 
     /* Ask GDI for the GRAPHICS_DEVICE */
     pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0);
-    if (!pGraphicsDevice)
+    ppdev = EngpGetPDEV(pustrDevice);
+
+    if (!pGraphicsDevice || !ppdev)
     {
         /* No device found */
         ERR("No device found!\n");
         return STATUS_INVALID_PARAMETER_1;
     }
 
-    if (iModeNum == 0)
-    {
-        PPDEVOBJ ppdev;
-        ppdev = EngpGetPDEV(pustrDevice);
-        if (!ppdev)
-        {
-            /* No device found */
-            ERR("No device found!\n");
-            return STATUS_INVALID_PARAMETER_1;
-        }
+    /* let's politely ask the driver for an updated mode list,
+       just in case there's something new in there (vbox) */
 
-        /* Let's politely ask the driver for an updated mode list,
-         * just in case there's something new in there (vbox) */
-
-        PDEVOBJ_vRefreshModeList(ppdev);
-        PDEVOBJ_vRelease(ppdev);
-    }
+    PDEVOBJ_vRefreshModeList(ppdev);
+    PDEVOBJ_vRelease(ppdev);
 
     iFoundMode = 0;
     for (i = 0; i < pGraphicsDevice->cDevModes; i++)