diff --git a/DShowPlugin/DShowPlugin.rc b/DShowPlugin/DShowPlugin.rc
index 682934d8..98fa8b15 100644
--- a/DShowPlugin/DShowPlugin.rc
+++ b/DShowPlugin/DShowPlugin.rc
@@ -169,10 +169,9 @@ BEGIN
     CONTROL         "",IDC_SPILLREDUCTION,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,171,263,11,14
     CONTROL         "DeviceSelection.UseAudioRender",IDC_USEAUDIORENDER,
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,233,218,119,10
-                    RTEXT           "DeviceSelection.Gamma",IDC_STATIC,234,233,95,8
+    RTEXT           "DeviceSelection.Gamma",IDC_STATIC,234,233,95,8
     CONTROL         "",IDC_GAMMA,"msctls_trackbar32",TBS_BOTH | WS_TABSTOP,229,242,191,26
     LTEXT           ".numbers!",IDC_GAMMAVAL,335,233,54,8
-
     LTEXT           "DeviceSelection.64BitWarning",IDC_64BIT_WARNING,7,287,300,16,NOT WS_VISIBLE
     DEFPUSHBUTTON   "OK",IDOK,314,289,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,372,289,50,14
diff --git a/OBS.rc b/OBS.rc
index 1bd4cdc2..b3578290 100644
--- a/OBS.rc
+++ b/OBS.rc
@@ -1002,7 +1002,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 IDD_SETTINGS_HOTKEYS DIALOGEX 0, 0, 429, 385
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     GROUPBOX        "Settings.Hotkeys.Audio",IDC_STATIC,7,7,413,70
@@ -1083,7 +1084,8 @@ BEGIN
 END
 
 IDD_SETTINGS_QSV DIALOGEX 0, 0, 429, 385
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     GROUPBOX        "Settings.QSV.RateControlMethod",IDC_STATIC,7,22,413,59