diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c
index db08739227d..54f340a8254 100644
--- a/win32ss/user/ntuser/display.c
+++ b/win32ss/user/ntuser/display.c
@@ -349,9 +349,12 @@ UserEnumDisplayDevices(
 
                     RtlStringCbCatW(pdispdev->DeviceID, sizeof(pdispdev->DeviceID), L"\\");
 
-                    /* FIXME: DevicePropertyDriverKeyName string should be appended */
-                    pHardwareId[0] = UNICODE_NULL;
-                    RtlStringCbCatW(pdispdev->DeviceID, sizeof(pdispdev->DeviceID), pHardwareId);
+                    dwLength = wcslen(pdispdev->DeviceID) + 1;
+                    Status = IoGetDeviceProperty(pdo,
+                                                 DevicePropertyDriverKeyName,
+                                                 (ARRAYSIZE(pdispdev->DeviceID) - dwLength) * sizeof(WCHAR),
+                                                 pdispdev->DeviceID + dwLength - 1,
+                                                 &dwLength);
                 }
 
                 TRACE("Hardware ID: %ls\n", pdispdev->DeviceID);