diff --git a/reactos/dll/win32/user32/windows/class.c b/reactos/dll/win32/user32/windows/class.c
index 0b7686e14a1..2064cc97e4e 100644
--- a/reactos/dll/win32/user32/windows/class.c
+++ b/reactos/dll/win32/user32/windows/class.c
@@ -11,6 +11,7 @@
 
 #include <user32.h>
 
+extern BOOL ControlsInitialized;
 
 /*
  * @implemented
@@ -45,6 +46,12 @@ GetClassInfoExA(
         }
     }
 
+    /* Register built-in controls if not already done */
+    if (! ControlsInitialized)
+    {
+        ControlsInitialized = ControlsInit(ClassName.Buffer);
+    }
+
     Ret = NtUserGetClassInfo(hinst,
                              &ClassName,
                              (LPWNDCLASSEXW)lpwcx,
@@ -87,6 +94,12 @@ GetClassInfoExW(
                              lpszClass);
     }
 
+    /* Register built-in controls if not already done */
+    if (! ControlsInitialized)
+    {
+        ControlsInitialized = ControlsInit(ClassName.Buffer);
+    }
+
     return NtUserGetClassInfo(hinst,
                               &ClassName,
                               lpwcx,