diff --git a/src/rufus.c b/src/rufus.c
index 04c9acfd..e571912f 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -65,6 +65,7 @@ static BOOL user_changed_label = FALSE;
 static BOOL app_changed_label = FALSE;
 static BOOL allowed_filesystem[FS_MAX] = { 0 };
 static int64_t last_iso_blocking_status;
+static int windows_to_go_selection = 0;
 static int selection_default, row_height, advanced_device_section_height, advanced_format_section_height, image_index;
 static int device_vpos, format_vpos, status_vpos;
 static int ddh, bw, hw, fw;	// DropDown Height, Main button width, half dropdown width, full dropdown width
@@ -1255,7 +1256,7 @@ static void ToggleImageOption(void)
 		IGNORE_RETVAL(ComboBox_ResetContent(hCtrl));
 		IGNORE_RETVAL(ComboBox_SetItemData(hCtrl, ComboBox_AddStringU(hCtrl, lmprintf(MSG_117)), FALSE));
 		IGNORE_RETVAL(ComboBox_SetItemData(hCtrl, ComboBox_AddStringU(hCtrl, lmprintf(MSG_118)), TRUE));
-		IGNORE_RETVAL(ComboBox_SetCurSel(hCtrl, 0));
+		IGNORE_RETVAL(ComboBox_SetCurSel(hCtrl, windows_to_go_selection));
 	} else
 		shift = -shift;
 	format_vpos += shift;
@@ -2955,7 +2956,10 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 			DeviceNum = (nDeviceIndex == CB_ERR) ? 0 : (DWORD)ComboBox_GetItemData(hDeviceList, nDeviceIndex);
 			break;
 		case IDC_IMAGE_OPTION:
+			if (HIWORD(wParam) != CBN_SELCHANGE)
+				break;
 			SetFileSystemAndClusterSize(NULL);
+			windows_to_go_selection = ComboBox_GetCurSel(GetDlgItem(hDlg, IDC_IMAGE_OPTION));
 			break;
 		case IDC_NB_PASSES:
 			if (HIWORD(wParam) != CBN_SELCHANGE)
@@ -3010,6 +3014,8 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 			SetMBRProps();
 			break;
 		case IDC_BOOT_SELECTION:
+			if (HIWORD(wParam) != CBN_SELCHANGE)
+				break;
 			bt = (int)ComboBox_GetItemData(hBootType, ComboBox_GetCurSel(hBootType));
 			if ((HIWORD(wParam) != CBN_SELCHANGE) || (bt == selection_default))
 				break;
diff --git a/src/rufus.rc b/src/rufus.rc
index 7a443436..422c4e26 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.0.1245"
+CAPTION "Rufus 3.0.1246"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -371,8 +371,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,18,1245,0
- PRODUCTVERSION 2,18,1245,0
+ FILEVERSION 2,18,1246,0
+ PRODUCTVERSION 2,18,1246,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -389,13 +389,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.18.1245"
+            VALUE "FileVersion", "2.18.1246"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.18.1245"
+            VALUE "ProductVersion", "2.18.1246"
         END
     END
     BLOCK "VarFileInfo"