diff --git a/AUTHORS b/AUTHORS
index 3cfdae2c1ff..22045b755e7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -113,6 +113,7 @@ Eiswindyeti
 Ellen Reitmayr
 Erdem Derebasoglu
 Erdem Derebaşoğlu
+Eric Lau
 Erik Putrycz
 Ervin Kolenovic
 Escoul
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad714ec198a..7151758a03d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ inserting new citations in a OpenOffic/LibreOffice document. [#6957](https://git
 - We fixed an issue where it was impossible to connect to OpenOffice/LibreOffice on Mac OSX. [#6970](https://github.com/JabRef/jabref/pull/6970)
 - We fixed an issue with the python script used by browser plugins that failed to locate JabRef if not installed in its default location. [#6963](https://github.com/JabRef/jabref/pull/6963/files)
 - We fixed an issue where identity column header had incorrect foreground color in the  Dark theme. [#6796](https://github.com/JabRef/jabref/issues/6796)
+- We fixed an issue where clicking on Collapse All button in the Search for Unlinked Local Files expanded the directory structure erroneously [#6848](https://github.com/JabRef/jabref/issues/6848)
 
 ### Removed
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java
index cbef3f235f6..66c97e29ef1 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesDialog.java
@@ -165,7 +165,7 @@ private void initialize() {
         buttonOptionCollapseAll.setOnAction(event -> {
             CheckBoxTreeItem<FileNodeWrapper> root = (CheckBoxTreeItem<FileNodeWrapper>) tree.getRoot();
             expandTree(root, false);
-            root.setExpanded(true);
+            root.setExpanded(false);
         });
 
         textfieldDirectoryPath = new TextField();