diff --git a/src/Main/Forms/ChangePasswordDialog.cpp b/src/Main/Forms/ChangePasswordDialog.cpp
index e8ab2847..d4a8853f 100644
--- a/src/Main/Forms/ChangePasswordDialog.cpp
+++ b/src/Main/Forms/ChangePasswordDialog.cpp
@@ -16,12 +16,11 @@ namespace VeraCrypt
 {
 	ChangePasswordDialog::ChangePasswordDialog (wxWindow* parent, shared_ptr <VolumePath> volumePath, Mode::Enum mode, shared_ptr <VolumePassword> password, shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> newPassword, shared_ptr <KeyfileList> newKeyfiles)
 		: ChangePasswordDialogBase (parent), DialogMode (mode), Path (volumePath)
-	{		
+	{
 		bool enableNewPassword = false;
 		bool enableNewKeyfiles = false;
 		bool enablePkcs5Prf = false;
 
-		SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
 		switch (mode)
 		{
 		case Mode::ChangePasswordAndKeyfiles:
diff --git a/src/Main/Forms/DeviceSelectionDialog.cpp b/src/Main/Forms/DeviceSelectionDialog.cpp
index 3a0d0fc8..4c5173c1 100644
--- a/src/Main/Forms/DeviceSelectionDialog.cpp
+++ b/src/Main/Forms/DeviceSelectionDialog.cpp
@@ -16,8 +16,6 @@ namespace VeraCrypt
 	DeviceSelectionDialog::DeviceSelectionDialog (wxWindow* parent)
 		: DeviceSelectionDialogBase (parent)
 	{
-		SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
-
 		wxBusyCursor busy;
 
 		list <int> colPermilles;
diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp
index 2c610b2b..5e28afdb 100644
--- a/src/Main/Forms/Forms.cpp
+++ b/src/Main/Forms/Forms.cpp
@@ -840,6 +840,7 @@ BenchmarkDialogBase::~BenchmarkDialogBase()
 ChangePasswordDialogBase::ChangePasswordDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
 	
 	wxBoxSizer* bSizer30;
 	bSizer30 = new wxBoxSizer( wxVERTICAL );
@@ -908,6 +909,7 @@ ChangePasswordDialogBase::~ChangePasswordDialogBase()
 DeviceSelectionDialogBase::DeviceSelectionDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
 	
 	wxBoxSizer* bSizer3;
 	bSizer3 = new wxBoxSizer( wxVERTICAL );
@@ -1214,6 +1216,7 @@ FavoriteVolumesDialogBase::~FavoriteVolumesDialogBase()
 KeyfilesDialogBase::KeyfilesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
 	
 	wxBoxSizer* bSizer26;
 	bSizer26 = new wxBoxSizer( wxVERTICAL );
@@ -1496,6 +1499,7 @@ LegalNoticesDialogBase::~LegalNoticesDialogBase()
 MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
 	
 	wxBoxSizer* bSizer5;
 	bSizer5 = new wxBoxSizer( wxVERTICAL );
@@ -1753,6 +1757,7 @@ NewSecurityTokenKeyfileDialogBase::~NewSecurityTokenKeyfileDialogBase()
 PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
 	
 	wxBoxSizer* bSizer32;
 	bSizer32 = new wxBoxSizer( wxVERTICAL );
@@ -2352,6 +2357,7 @@ RandomPoolEnrichmentDialogBase::~RandomPoolEnrichmentDialogBase()
 SecurityTokenKeyfilesDialogBase::SecurityTokenKeyfilesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
 	
 	wxBoxSizer* bSizer3;
 	bSizer3 = new wxBoxSizer( wxVERTICAL );
diff --git a/src/Main/Forms/KeyfilesDialog.cpp b/src/Main/Forms/KeyfilesDialog.cpp
index 1dbf872c..2bcdf2f9 100644
--- a/src/Main/Forms/KeyfilesDialog.cpp
+++ b/src/Main/Forms/KeyfilesDialog.cpp
@@ -15,7 +15,6 @@ namespace VeraCrypt
 	KeyfilesDialog::KeyfilesDialog (wxWindow* parent, shared_ptr <KeyfileList> keyfiles)
 		: KeyfilesDialogBase (parent), Keyfiles (keyfiles)
 	{
-		SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
 		mKeyfilesPanel = new KeyfilesPanel (this, keyfiles);
 		PanelSizer->Add (mKeyfilesPanel, 1, wxALL | wxEXPAND);
 
diff --git a/src/Main/Forms/MountOptionsDialog.cpp b/src/Main/Forms/MountOptionsDialog.cpp
index cc32d46e..e60492e1 100644
--- a/src/Main/Forms/MountOptionsDialog.cpp
+++ b/src/Main/Forms/MountOptionsDialog.cpp
@@ -20,7 +20,6 @@ namespace VeraCrypt
 #endif
 		), Options (options)
 	{
-		SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
 		if (!title.empty())
 			this->SetTitle (title);
 		else if (options.Path && !options.Path->IsEmpty())
diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp
index 0c65c5c4..e22e304b 100644
--- a/src/Main/Forms/PreferencesDialog.cpp
+++ b/src/Main/Forms/PreferencesDialog.cpp
@@ -27,7 +27,7 @@ namespace VeraCrypt
 		RestoreValidatorBell (false)
 	{
 #define TC_CHECK_BOX_VALIDATOR(NAME) (TC_JOIN(NAME,CheckBox))->SetValidator (wxGenericValidator (&Preferences.NAME));
-		SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
+
 #ifdef TC_MACOSX
 		PreferencesNotebook->SetMinSize (wxSize (Gui->GetCharWidth (PreferencesNotebook) * 108, -1));
 #endif
diff --git a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp b/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
index 29dfa60a..a0930726 100644
--- a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
+++ b/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
@@ -17,7 +17,6 @@ namespace VeraCrypt
 	SecurityTokenKeyfilesDialog::SecurityTokenKeyfilesDialog (wxWindow* parent, bool selectionMode)
 		: SecurityTokenKeyfilesDialogBase (parent)
 	{
-		SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
 		if (selectionMode)
 			SetTitle (LangString["SELECT_TOKEN_KEYFILES"]);
 
diff --git a/src/Main/Forms/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp
index 3ae5ea60..c03beab9 100644
--- a/src/Main/Forms/TrueCrypt.fbp
+++ b/src/Main/Forms/TrueCrypt.fbp
@@ -4972,7 +4972,7 @@
             <property name="subclass"></property>
             <property name="title"></property>
             <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
+            <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
             <property name="window_name"></property>
             <property name="window_style"></property>
             <event name="OnActivate"></event>
@@ -5300,7 +5300,7 @@
             <property name="subclass"></property>
             <property name="title">Select a Partition or Device</property>
             <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
+            <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
             <property name="window_name"></property>
             <property name="window_style"></property>
             <event name="OnActivate"></event>
@@ -8117,7 +8117,7 @@
             <property name="subclass"></property>
             <property name="title">Select Keyfiles</property>
             <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
+            <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
             <property name="window_name"></property>
             <property name="window_style"></property>
             <event name="OnActivate"></event>
@@ -10851,7 +10851,7 @@
             <property name="subclass"></property>
             <property name="title">Enter VeraCrypt Volume Password</property>
             <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
+            <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
             <property name="window_name"></property>
             <property name="window_style"></property>
             <event name="OnActivate"></event>
@@ -12987,7 +12987,7 @@
             <property name="subclass"></property>
             <property name="title">Preferences</property>
             <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
+            <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
             <property name="window_name"></property>
             <property name="window_style"></property>
             <event name="OnActivate"></event>
@@ -18975,7 +18975,7 @@
             <property name="subclass"></property>
             <property name="title">Security Token Keyfiles</property>
             <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
+            <property name="window_extra_style">wxWS_EX_VALIDATE_RECURSIVELY</property>
             <property name="window_name"></property>
             <property name="window_style"></property>
             <event name="OnActivate"></event>