diff --git a/win32ss/gdi/ntgdi/dcutil.c b/win32ss/gdi/ntgdi/dcutil.c
index ca9e4c99295..aa130f02d7f 100644
--- a/win32ss/gdi/ntgdi/dcutil.c
+++ b/win32ss/gdi/ntgdi/dcutil.c
@@ -158,6 +158,11 @@ IntGdiSetTextAlign(HDC  hDC,
     pdcattr = dc->pdcattr;
     prevAlign = pdcattr->lTextAlign;
     pdcattr->lTextAlign = Mode;
+    if (pdcattr->dwLayout & LAYOUT_RTL)
+    {
+        if ((Mode & TA_CENTER) != TA_CENTER) Mode ^= TA_RIGHT;
+    }
+    pdcattr->flTextAlign = Mode & TA_MASK;
     DC_UnlockDc(dc);
     return  prevAlign;
 }