diff --git a/reactos/subsystems/win32/win32k/objects/font.c b/reactos/subsystems/win32/win32k/objects/font.c
index 1d100b93613..1a6fdb8db57 100644
--- a/reactos/subsystems/win32/win32k/objects/font.c
+++ b/reactos/subsystems/win32/win32k/objects/font.c
@@ -816,6 +816,18 @@ NtGdiHfontCreate(
   }
   TEXTOBJ_UnlockText(TextObj);
 
+  if (pvCliData && hNewFont)
+  {
+    // FIXME: use GDIOBJ_InsertUserData
+    KeEnterCriticalRegion();
+    {
+       INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hNewFont);
+       PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index];
+       Entry->UserData = pvCliData;
+    }
+    KeLeaveCriticalRegion();
+  }
+
   return hNewFont;
 }