diff --git a/PowerEditor/src/MISC/md5/md5Dlgs.rc b/PowerEditor/src/MISC/md5/md5Dlgs.rc
index c35eb4bb7..33c2486ab 100644
--- a/PowerEditor/src/MISC/md5/md5Dlgs.rc
+++ b/PowerEditor/src/MISC/md5/md5Dlgs.rc
@@ -20,8 +20,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "md5Dlgs_rc.h"
 
 IDD_HASHFROMFILES_DLG DIALOGEX 0, 0, 357, 213
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Generate MD5 digest from files"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
@@ -33,8 +33,8 @@ BEGIN
 END
 
 IDD_HASHFROMTEXT_DLG DIALOGEX 0, 0, 357, 213
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Generate MD5 digest"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc
index 0d1e47184..71cced5d3 100644
--- a/PowerEditor/src/Notepad_plus.rc
+++ b/PowerEditor/src/Notepad_plus.rc
@@ -1209,7 +1209,7 @@ END
 
 IDD_DEBUGINFOBOX DIALOGEX 0, 0, 271, 200
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Debug Info"
 FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1
 BEGIN
@@ -1220,7 +1220,7 @@ END
 
 IDD_DOSAVEORNOTBOX DIALOGEX 0, 0, 310, 80
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_WINDOWEDGE
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Save"
 FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1
 BEGIN
@@ -1234,7 +1234,7 @@ END
 
 IDD_GOLINE DIALOGEX 26, 41, 261, 88
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Go To..."
 FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x0
 BEGIN
@@ -1252,7 +1252,7 @@ END
 
 IDD_VALUE_DLG DIALOGEX 0, 0, 74, 17
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_DLGMODALFRAME
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1
 BEGIN
     LTEXT             "STATIC :",IDC_VALUE_STATIC,6,4,45,8
diff --git a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.rc b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.rc
index da17047fd..5a1f910f5 100644
--- a/PowerEditor/src/ScintillaComponent/FindReplaceDlg.rc
+++ b/PowerEditor/src/ScintillaComponent/FindReplaceDlg.rc
@@ -22,7 +22,7 @@
 
 IDD_FIND_REPLACE_DLG DIALOGEX 36, 44, 382, 200
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-EXSTYLE WS_EX_TOOLWINDOW
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Replace"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
@@ -111,8 +111,8 @@ DEFPUSHBUTTON   ">",IDC_INCFINDNXTOK,243,0,16,14, NOT WS_VISIBLE
 END
 
 IDD_FINDINFINDER_DLG DIALOGEX 36, 44, 367, 200
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Find in search results"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
diff --git a/PowerEditor/src/ScintillaComponent/columnEditor.rc b/PowerEditor/src/ScintillaComponent/columnEditor.rc
index 23ae3e8d6..7699faa27 100644
--- a/PowerEditor/src/ScintillaComponent/columnEditor.rc
+++ b/PowerEditor/src/ScintillaComponent/columnEditor.rc
@@ -21,7 +21,7 @@
 
 IDD_COLUMNEDIT DIALOGEX 26, 41, 223, 221
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 		CAPTION "Column / Multi-Selection Editor"
 FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x0
 BEGIN
diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc
index ef03eee5e..54ed17921 100644
--- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc
+++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc
@@ -23,8 +23,8 @@
 #endif
 
 IDD_STYLER_DLG DIALOGEX 36, 44, 500, 246
-STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Style Configurator"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
diff --git a/PowerEditor/src/WinControls/FindCharsInRange/findCharsInRange.rc b/PowerEditor/src/WinControls/FindCharsInRange/findCharsInRange.rc
index 6fc0668a1..a2876b6e7 100644
--- a/PowerEditor/src/WinControls/FindCharsInRange/findCharsInRange.rc
+++ b/PowerEditor/src/WinControls/FindCharsInRange/findCharsInRange.rc
@@ -20,7 +20,7 @@
 
 IDD_FINDCHARACTERS DIALOGEX 26, 41, 263, 126
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Find Characters in Range..."
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
diff --git a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.rc b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.rc
index fc3d862c9..f28693a8b 100644
--- a/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.rc
+++ b/PowerEditor/src/WinControls/PluginsAdmin/pluginsAdmin.rc
@@ -23,8 +23,8 @@
 #endif
 
 IDD_PLUGINSADMIN_DLG DIALOGEX 36, 44, 500, 300
-STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Plugins Admin"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
@@ -42,4 +42,3 @@ BEGIN
 	//PUSHBUTTON      "Close", IDCANCEL,332,270,57,14
     //PUSHBUTTON      "Settings",IDC_PLUGINADM_SETTINGS_BUTTON,255,270,69,14
 END
-
diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc
index 29dca97bb..111c97599 100644
--- a/PowerEditor/src/WinControls/Preference/preference.rc
+++ b/PowerEditor/src/WinControls/Preference/preference.rc
@@ -24,7 +24,7 @@
 
 IDD_PREFERENCE_BOX DIALOGEX 0, 0, 560, 235
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Preferences"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
diff --git a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.rc b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.rc
index e9eed2e6d..2f3c03bfe 100644
--- a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.rc
+++ b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.rc
@@ -25,9 +25,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #endif
 
 IDD_RUN_DLG DIALOGEX 0, 0, 196, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Run..."
 FONT 8, TEXT("MS Shell Dlg"), 400, 0, 0x1
 BEGIN
diff --git a/PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc b/PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc
index c9212f150..791dad04f 100644
--- a/PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc
+++ b/PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc
@@ -22,9 +22,8 @@
 #include "RunMacroDlg_rc.h"
 
 IDD_RUN_MACRO_DLG DIALOGEX 0, 0, 168, 110
-STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Run a Macro Multiple Times"
 FONT 8, TEXT("MS Shell Dlg"), 400, 0, 0x1
 BEGIN
diff --git a/PowerEditor/src/WinControls/shortcut/shortcut.rc b/PowerEditor/src/WinControls/shortcut/shortcut.rc
index 2f3d95cb8..dcaf1aa96 100644
--- a/PowerEditor/src/WinControls/shortcut/shortcut.rc
+++ b/PowerEditor/src/WinControls/shortcut/shortcut.rc
@@ -24,7 +24,7 @@
 
 IDD_SHORTCUT_DLG DIALOGEX 0, 0, 180, 105
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Shortcut"
 FONT 8, TEXT("MS Shell Dlg"), 400, 0, 0x1
 BEGIN
@@ -44,7 +44,7 @@ END
 
 IDD_SHORTCUTSCINT_DLG DIALOGEX 0, 0, 286, 114
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW
+EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
 CAPTION "Shortcut"
 FONT 8, TEXT("MS Shell Dlg"), 400, 0, 0x1
 BEGIN