diff --git a/src/rufus.c b/src/rufus.c
index 1f09debf..4bc0b02b 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -448,7 +448,7 @@ static BOOL PopulateProperties(int ComboIndex)
 	char capacity[64];
 	static char *suffix[] = { "KB", "MB", "GB", "TB", "PB"};
 	char no_label[] = STR_NO_LABEL;
-	int i;
+	int i, fs;
 
 	IGNORE_RETVAL(ComboBox_ResetContent(hCapacity));
 	IGNORE_RETVAL(ComboBox_ResetContent(hFileSystem));
@@ -461,6 +461,9 @@ static BOOL PopulateProperties(int ComboIndex)
 	hFSTooltip = NULL;
 	memset(&SelectedDrive, 0, sizeof(SelectedDrive));
 
+	EnableWindow(GetDlgItem(hMainDialog, IDC_DOS), FALSE);
+	EnableWindow(GetDlgItem(hMainDialog, IDC_DOSTYPE), FALSE);
+
 	if (ComboIndex < 0) {
 		return TRUE;
 	}
@@ -469,6 +472,9 @@ static BOOL PopulateProperties(int ComboIndex)
 	if (!GetDriveInfo())	// This also populates FS
 		return FALSE;
 	SetFSFromISO();
+	fs = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem));
+	EnableWindow(GetDlgItem(hMainDialog, IDC_DOS), (fs == FS_FAT16) || (fs == FS_FAT32) || (fs == FS_NTFS));
+	EnableWindow(GetDlgItem(hMainDialog, IDC_DOSTYPE), (fs == FS_FAT16) || (fs == FS_FAT32) || (fs == FS_NTFS));
 
 	HumanReadableSize = (double)SelectedDrive.DiskSize;
 	for (i=0; i<ARRAYSIZE(suffix); i++) {
diff --git a/src/rufus.rc b/src/rufus.rc
index d6625440..6e5fc069 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 206, 289
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
-CAPTION "Rufus v1.2.0.168"
+CAPTION "Rufus v1.2.0.169"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,94,248,50,14
@@ -71,7 +71,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,231,175,50,14,WS_GROUP
     CONTROL         "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL,
                     "SysLink",WS_TABSTOP,46,47,114,9
-    LTEXT           "Version 1.2.0 (Build 168)",IDC_STATIC,46,19,78,8
+    LTEXT           "Version 1.2.0 (Build 169)",IDC_STATIC,46,19,78,8
     PUSHBUTTON      "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP
     EDITTEXT        IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL
     LTEXT           "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@@ -216,8 +216,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,0,168
- PRODUCTVERSION 1,2,0,168
+ FILEVERSION 1,2,0,169
+ PRODUCTVERSION 1,2,0,169
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -234,13 +234,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "1.2.0.168"
+            VALUE "FileVersion", "1.2.0.169"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "1.2.0.168"
+            VALUE "ProductVersion", "1.2.0.169"
         END
     END
     BLOCK "VarFileInfo"