diff --git a/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.cpp b/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.cpp
index 9ba22184bc..4fefe7c3b0 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.cpp
+++ b/modules/juce_gui_basics/filebrowser/juce_FilenameComponent.cpp
@@ -107,8 +107,10 @@ void FilenameComponent::setDefaultBrowseTarget (const File& newDefaultDirectory)
 
 File FilenameComponent::getLocationToBrowse()
 {
-    return getCurrentFile() == File() ? defaultBrowseFile
-                                      : getCurrentFile();
+    if (lastFilename.isEmpty() && defaultBrowseFile != File())
+        return defaultBrowseFile;
+
+    return getCurrentFile();
 }
 
 void FilenameComponent::showChooser()