diff --git a/modules/juce_core/system/juce_PlatformDefs.h b/modules/juce_core/system/juce_PlatformDefs.h
index 89563be2ee..43602f4d11 100644
--- a/modules/juce_core/system/juce_PlatformDefs.h
+++ b/modules/juce_core/system/juce_PlatformDefs.h
@@ -63,7 +63,7 @@
 //==============================================================================
 #if JUCE_IOS || JUCE_LINUX || JUCE_ANDROID || JUCE_PPC
   /** This will try to break into the debugger if the app is currently being debugged.
-      If called by an app that's not being debugged, the behaviour isn't defined - it may 
+      If called by an app that's not being debugged, the behaviour isn't defined - it may
       crash or not, depending on the platform.
       @see jassert()
   */
diff --git a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
index 2d3a2cee05..bacba05241 100644
--- a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
+++ b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
@@ -218,8 +218,6 @@ void FileChooser::showPlatformDialog (Array<File>& results, const String& title_
             info.customComponent->enterModalState();
         }
 
-        const StringRef separatorTokens (";,|");
-
         const size_t filterSpaceNumChars = 2048;
         HeapBlock<WCHAR> filters;
         filters.calloc (filterSpaceNumChars);
@@ -228,7 +226,7 @@ void FileChooser::showPlatformDialog (Array<File>& results, const String& title_
                             ((filterSpaceNumChars - 1) * sizeof (WCHAR) - bytesWritten));
 
         for (int i = 0; i < filterSpaceNumChars; ++i)
-            if (separatorTokens.text.indexOf ((juce_wchar) filters[i]) >= 0)
+            if (filters[i] == '|')
                 filters[i] = 0;
 
         OPENFILENAMEW of = { 0 };
@@ -255,7 +253,7 @@ void FileChooser::showPlatformDialog (Array<File>& results, const String& title_
         if (isSaveDialogue)
         {
             StringArray tokens;
-            tokens.addTokens (filter, separatorTokens, "\"'");
+            tokens.addTokens (filter, ";,", "\"'");
             tokens.trim();
             tokens.removeEmptyStrings();