diff --git a/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp
index 35153cf1fe..94e3a40ef7 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp
+++ b/modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.cpp
@@ -180,10 +180,10 @@ bool FileBrowserComponent::currentFileIsValid() const
 {
     auto f = getSelectedFile (0);
 
-    if (isSaveMode())
-        return (flags & canSelectDirectories) != 0 || ! f.isDirectory();
+    if ((flags & canSelectDirectories) == 0 && f.isDirectory())
+        return false;
 
-    return f.exists();
+    return isSaveMode() || f.exists();
 }
 
 File FileBrowserComponent::getHighlightedFile() const noexcept