diff --git a/src/FileNames.cpp b/src/FileNames.cpp
index 675f3af3e..14a775afa 100644
--- a/src/FileNames.cpp
+++ b/src/FileNames.cpp
@@ -662,6 +662,14 @@ bool FileNames::IsTempDirectoryNameOK( const FilePath & Name )
    wxFileName cmpFile( Name );
    wxString NameCanonical = cmpFile.GetLongPath( ) + "\\";
 #endif
+
+   if (FileNames::FATFilesystemDenied(NameCanonical,
+                                      XO("The temporary files direcotory is on a FAT formatted drive.\n"
+                                         "Resetting to default location.")))
+   {
+      return false;
+   }
+
    return !(NameCanonical.StartsWith( BadPath ));
 }