diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c
index 12c88143e9..a12a9dcbc8 100644
--- a/win32ss/gdi/ntgdi/freetype.c
+++ b/win32ss/gdi/ntgdi/freetype.c
@@ -1617,8 +1617,8 @@ FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI,
     {
         IntRequestFontSize(NULL, FontGDI, 0, 0);
     }
-    TM->tmAscent = FontGDI->tmAscent;
-    TM->tmDescent = FontGDI->tmDescent;
+    TM->tmAscent = (Face->size->metrics.ascender + 32) >> 6; /* Units above baseline */
+    TM->tmDescent = (32 - Face->size->metrics.descender) >> 6; /* Units below baseline */
     TM->tmHeight = TM->tmAscent + TM->tmDescent;
     TM->tmInternalLeading = FontGDI->tmInternalLeading;