diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf
index 49c7b8bd11..dc322952a1 100644
--- a/boot/bootdata/hivedef.inf
+++ b/boot/bootdata/hivedef.inf
@@ -87,7 +87,7 @@ HKCU,"Control Panel\Desktop\WindowMetrics","ScrollWidth",2,"16"
 HKCU,"Control Panel\Desktop\WindowMetrics","ScrollHeight",2,"16"
 HKCU,"Control Panel\Desktop\WindowMetrics","CaptionWidth",2,"18"
 HKCU,"Control Panel\Desktop\WindowMetrics","CaptionHeight",2,"18"
-HKCU,"Control Panel\Desktop\WindowMetrics","SmCaptionWidth",2,"13"
+HKCU,"Control Panel\Desktop\WindowMetrics","SmCaptionWidth",2,"12"
 HKCU,"Control Panel\Desktop\WindowMetrics","SmCaptionHeight",2,"15"
 HKCU,"Control Panel\Desktop\WindowMetrics","MenuWidth",2,"18"
 HKCU,"Control Panel\Desktop\WindowMetrics","MenuHeight",2,"18"
diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c
index f07db3aab2..17be7940df 100644
--- a/win32ss/user/ntuser/sysparams.c
+++ b/win32ss/user/ntuser/sysparams.c
@@ -253,7 +253,7 @@ SpiUpdatePerUserSystemParameters(VOID)
     gspv.ncm.iCaptionWidth = SpiLoadMetric(L"CaptionWidth", 19);
     gspv.ncm.iCaptionHeight = SpiLoadMetric(L"CaptionHeight", 19);
     gspv.ncm.iSmCaptionWidth = SpiLoadMetric(L"SmCaptionWidth", 12);
-    gspv.ncm.iSmCaptionHeight =  SpiLoadMetric(L"SmCaptionHeight", 14);
+    gspv.ncm.iSmCaptionHeight =  SpiLoadMetric(L"SmCaptionHeight", 15);
     gspv.ncm.iMenuWidth = SpiLoadMetric(L"MenuWidth", 18);
     gspv.ncm.iMenuHeight = SpiLoadMetric(L"MenuHeight", 18);
 #if (WINVER >= 0x0600)
@@ -301,7 +301,7 @@ SpiUpdatePerUserSystemParameters(VOID)
     gspv.bBeep = TRUE;
     gspv.uiFocusBorderWidth = 1;
     gspv.uiFocusBorderHeight = 1;
-    gspv.bMenuDropAlign = 1;
+    gspv.bMenuDropAlign = 0;
     gspv.dwMenuShowDelay = 100;
     gspv.dwForegroundFlashCount = 3;