diff --git a/ChangeLog.txt b/ChangeLog.txt
index 94979196..0d6f4191 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -8,6 +8,7 @@ o Version 3.6 (2019.07.??)
     Fix download script not running when the username contains a space
     Fix translated messages potentially being truncated (e.g. Thai)
     Fix progress bar report for screen readers (Accessibility)
+    Fix a regression where Windows format prompts would not be suppressed
     Improve(?) Windows To Go support by following Microsoft recommended partition order
     Disable ISO mode when Manjaro ISOHybrids are being used
     Update embedded GRUB to version 2.04
diff --git a/src/rufus.rc b/src/rufus.rc
index a848ab82..45272f1b 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.6.1547"
+CAPTION "Rufus 3.6.1548"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -394,8 +394,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,1547,0
- PRODUCTVERSION 3,6,1547,0
+ FILEVERSION 3,6,1548,0
+ PRODUCTVERSION 3,6,1548,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.6.1547"
+            VALUE "FileVersion", "3.6.1548"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.6.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.6.1547"
+            VALUE "ProductVersion", "3.6.1548"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/stdlg.c b/src/stdlg.c
index bbec2a3e..7911788b 100644
--- a/src/stdlg.c
+++ b/src/stdlg.c
@@ -1998,7 +1998,8 @@ void SetAlertPromptMessages(void)
 	char mui_path[MAX_PATH];
 
 	// Fetch the localized strings in the relevant MUI
-	static_sprintf(mui_path, "%s\\%s\\shell32.dll.mui", system_dir, GetCurrentMUI());
+	// Must use sysnative_dir rather than system_dir as we may not find the MUI's otherwise
+	static_sprintf(mui_path, "%s\\%s\\shell32.dll.mui", sysnative_dir, GetCurrentMUI());
 	mui_lib = LoadLibraryU(mui_path);
 	if (mui_lib != NULL) {
 		// 4097 = "You need to format the disk in drive %c: before you can use it." (dialog text)
@@ -2014,7 +2015,7 @@ void SetAlertPromptMessages(void)
 		}
 		FreeLibrary(mui_lib);
 	}
-	static_sprintf(mui_path, "%s\\%s\\urlmon.dll.mui", system_dir, GetCurrentMUI());
+	static_sprintf(mui_path, "%s\\%s\\urlmon.dll.mui", sysnative_dir, GetCurrentMUI());
 	mui_lib = LoadLibraryU(mui_path);
 	if (mui_lib != NULL) {
 		// 2070 = "Windows Security Warning" (yes, that's what MS uses for a stupid cookie!)