diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index 1253e379..34c41358 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -771,6 +771,8 @@ int createCfgDlg()
   // by ORTIM: 14-August-2002
   DWORD dwBaseUnits = GetDialogBaseUnits();
 
+#define DEFAULT_STYLES (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS)
+
   for (nIdx = 0; nIdx < nNumFields; nIdx++) {
     static struct {
       char* pszClass;
@@ -778,40 +780,42 @@ int createCfgDlg()
       DWORD dwExStyle;
     } ClassTable[] = {
       { "STATIC",       // FIELD_LABEL
-        WS_GROUP | WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS /*| WS_TABSTOP*/,
+        DEFAULT_STYLES | WS_GROUP /*| WS_TABSTOP*/,
         WS_EX_TRANSPARENT },
       { "STATIC",       // FIELD_ICON
-        WS_GROUP | WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS /*| WS_TABSTOP*/ | SS_ICON,
+        DEFAULT_STYLES | WS_GROUP /*| WS_TABSTOP*/ | SS_ICON,
         0 },
       { "STATIC",       // FIELD_BITMAP
-        WS_GROUP | WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS /*| WS_TABSTOP*/ | SS_BITMAP,
+        DEFAULT_STYLES | WS_GROUP /*| WS_TABSTOP*/ | SS_BITMAP,
         0 },
       { "BUTTON",       // FIELD_BROWSEBUTTON
-        WS_GROUP | WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP,
+        DEFAULT_STYLES | WS_GROUP | WS_TABSTOP,
         0 },
       { "BUTTON",       // FIELD_CHECKBOX
-        WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTOCHECKBOX,
+        DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTOCHECKBOX,
         0 },
       { "BUTTON",       // FIELD_RADIOBUTTON
-        WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTORADIOBUTTON,
+        DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTORADIOBUTTON,
         0 },
       { "EDIT",         // FIELD_TEXT
-        WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
+        DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "EDIT",         // FIELD_FILEREQUEST
-        WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
+        DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "EDIT",         // FIELD_DIRREQUEST
-        WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
+        DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "COMBOBOX",     // FIELD_COMBOBOX
-        WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | WS_VSCROLL | WS_CLIPCHILDREN | CBS_AUTOHSCROLL | CBS_HASSTRINGS,
+        DEFAULT_STYLES | WS_TABSTOP | WS_VSCROLL | WS_CLIPCHILDREN | CBS_AUTOHSCROLL | CBS_HASSTRINGS,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "LISTBOX",      // FIELD_LISTBOX
-        WS_GROUP | WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | LBS_DISABLENOSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT,
+        DEFAULT_STYLES | WS_GROUP | WS_TABSTOP | LBS_DISABLENOSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE }
     };
 
+#undef DEFAULT_STYLES
+
     if (pFields[nIdx].nType < 1 || pFields[nIdx].nType > (sizeof(ClassTable) / sizeof(ClassTable[0])))
       continue;