diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index a9b81bcb..6a59dd90 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -643,8 +643,14 @@ BOOL CALLBACK cfgDlgProc(HWND   hwndDlg,
     case WM_CTLCOLORDLG:
     case WM_CTLCOLORBTN:
     case WM_CTLCOLORLISTBOX:
-      SetBkMode((HDC)wParam, TRANSPARENT);
-      return (BOOL)GetWindowLong((HWND)lParam, GWL_USERDATA);
+    {
+      BOOL brush = (BOOL)GetWindowLong((HWND)lParam, GWL_USERDATA);
+      if (brush)
+      {
+        SetBkMode((HDC)wParam, TRANSPARENT);
+        return brush;
+      }
+    }
   }
 	return 0;
 }
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index a6742932..18b54332 100644
Binary files a/Plugins/InstallOptions.dll and b/Plugins/InstallOptions.dll differ