diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c
index 12c88143e9..fa49673efb 100644
--- a/win32ss/gdi/ntgdi/freetype.c
+++ b/win32ss/gdi/ntgdi/freetype.c
@@ -1618,8 +1618,8 @@ FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI,
         IntRequestFontSize(NULL, FontGDI, 0, 0);
     }
     TM->tmAscent = FontGDI->tmAscent;
-    TM->tmDescent = FontGDI->tmDescent;
-    TM->tmHeight = TM->tmAscent + TM->tmDescent;
+    TM->tmDescent = (32 - Face->size->metrics.descender) >> 6;
+    TM->tmHeight = TM->tmAscent + FontGDI->tmDescent;
     TM->tmInternalLeading = FontGDI->tmInternalLeading;
 
     /* MSDN says: