diff --git a/Editor/src/Windows/FileSystemUI.cpp b/Editor/src/Windows/FileSystemUI.cpp
index 68ae7a99..0c213fcc 100644
--- a/Editor/src/Windows/FileSystemUI.cpp
+++ b/Editor/src/Windows/FileSystemUI.cpp
@@ -593,7 +593,10 @@ namespace Nuake
                         FileSystem::FilteredDirectories = FileSystem::SearchFilesWithKeyword(m_searchKeyWord, FileSystem::RootDirectory->fullPath);
                         RefreshFileBrowser();
 
-                        // TODO: Fix when creating a new file
+                        if(m_searchKeyWord.empty())
+                        {
+                            FileSystem::FilteredDirectories.clear();
+                        }
                     }