diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 49775b7a806..c990fe5e233 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -2485,7 +2485,8 @@ static void update_codepage(void)
                 add_font_list(hkey, &nls_update_font_list[i], screen_dpi);
                 RegCloseKey(hkey);
             }
-            if (!RegCreateKeyW( HKEY_LOCAL_MACHINE,
+            /* Only update these if the Codepage changed. */
+            if (strcmp( buf, cpbuf ) && !RegCreateKeyW( HKEY_LOCAL_MACHINE,
                                 L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes", &hkey ))
             {
                 RegSetValueExA(hkey, "MS Shell Dlg", 0, REG_SZ, (const BYTE *)nls_update_font_list[i].shelldlg,