diff --git a/src/app/ui/file_selector.cpp b/src/app/ui/file_selector.cpp
index 5f5e5b8b7..e5f666d93 100644
--- a/src/app/ui/file_selector.cpp
+++ b/src/app/ui/file_selector.cpp
@@ -775,6 +775,9 @@ void FileSelector::onFileListCurrentFolderChanged()
 
   updateLocation();
   updateNavigationButtons();
+
+  // Close the autocomplete popup just in case it's open.
+  m_fileName->closeListBox();
 }
 
 } // namespace app