diff --git a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp
index 07aef35519..296dca4c00 100644
--- a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp
+++ b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp
@@ -110,7 +110,7 @@ void DirectoryContentsList::refresh()
 
     if (root.isDirectory())
     {
-        fileFindHandle = std::make_unique<RangedDirectoryIterator>(root, false, "*", fileTypeFlags);
+        fileFindHandle = std::make_unique<RangedDirectoryIterator> (root, false, "*", fileTypeFlags);
         shouldStop = false;
         isSearching = true;
         thread.addTimeSliceClient (this);
@@ -222,6 +222,7 @@ bool DirectoryContentsList::checkNextFile (bool& hasChanged)
         }
 
         fileFindHandle = nullptr;
+        isSearching = false;
 
         if (! wasEmpty && files.isEmpty())
             hasChanged = true;
diff --git a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h
index a046554584..99de630573 100644
--- a/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h
+++ b/modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h
@@ -208,8 +208,7 @@ private:
     OwnedArray<FileInfo> files;
 
     std::unique_ptr<RangedDirectoryIterator> fileFindHandle;
-    std::atomic<bool> shouldStop { true };
-    bool isSearching = false;
+    std::atomic<bool> shouldStop { true }, isSearching { false };
 
     bool wasEmpty = true;