diff --git a/src/win/86Box.rc b/src/win/86Box.rc
index 611ca181c..b74f7bf9c 100644
--- a/src/win/86Box.rc
+++ b/src/win/86Box.rc
@@ -287,7 +287,7 @@ END
 DLG_SND_GAIN DIALOG DISCARDABLE  0, 0, 113, 136
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Sound Gain"
-FONT 8, "MS Sans Serif"
+FONT 9, "Segoe UI"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,57,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,57,24,50,14
@@ -299,7 +299,7 @@ END
 DLG_NEW_FLOPPY DIALOG DISCARDABLE  0, 0, 226, 86
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "New Image"
-FONT 8, "MS Sans Serif"
+FONT 9, "Segoe UI"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,74,65,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,129,65,50,14
diff --git a/src/win/win_jsconf.c b/src/win/win_jsconf.c
index a557f753d..40329c95e 100644
--- a/src/win/win_jsconf.c
+++ b/src/win/win_jsconf.c
@@ -326,8 +326,8 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
         *data++ = 0; /*predefined dialog box class*/
         data += MultiByteToWideChar(CP_ACP, 0, "Device Configuration", -1, data, 50);
 
-        *data++ = 8; /*Point*/
-        data += MultiByteToWideChar(CP_ACP, 0, "MS Sans Serif", -1, data, 50);
+        *data++ = 9; /*Point*/
+        data += MultiByteToWideChar(CP_ACP, 0, "Segoe UI", -1, data, 50);
         
         if (((uintptr_t)data) & 2)
                 data++;
@@ -548,8 +548,8 @@ uint8_t joystickconfig_open(HWND hwnd, int joy_nr, int type)
         item->y = y;
         item->cx = 50;
         item->cy = 14;
-        item->id = IDCANCEL;  /* OK button identifier */
-        item->style = WS_CHILD | WS_VISIBLE | BS_DEFPUSHBUTTON;
+        item->id = IDCANCEL;  /* Cancel button identifier */
+        item->style = WS_CHILD | WS_VISIBLE;
 
         data = (uint16_t *)(item + 1);
         *data++ = 0xFFFF;