diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp
index c7d7e7395..c9a725bd4 100644
--- a/src/tools/ecode/ecode.cpp
+++ b/src/tools/ecode/ecode.cpp
@@ -2291,6 +2291,8 @@ void App::closeFolder() {
 	mFileSystemModel->setRootPath( "" );
 	mPluginManager->setWorkspaceFolder( "" );
 	updateOpenRecentFolderBtn();
+	if ( mUniversalLocator )
+		mUniversalLocator->updateFilesTable();
 	if ( getConfig().ui.welcomeScreen ) {
 		UIWelcomeScreen::createWelcomeScreen( this );
 		mStatusBar->setVisible( false );
diff --git a/src/tools/ecode/projectdirectorytree.hpp b/src/tools/ecode/projectdirectorytree.hpp
index 7d516e4c7..e7ad624cd 100644
--- a/src/tools/ecode/projectdirectorytree.hpp
+++ b/src/tools/ecode/projectdirectorytree.hpp
@@ -44,7 +44,8 @@ class FileListModel : public Model {
 				return Variant( iconFor( index ) );
 			case ModelRole::Display: {
 				if ( !mBasePath.empty() && index.column() == 1 &&
-					 mBasePath.size() < mFiles[index.row()].size() )
+					 mBasePath.size() < mFiles[index.row()].size() &&
+					 String::startsWith( mFiles[index.row()], mBasePath ) )
 					return Variant( mFiles[index.row()].substr( mBasePath.size() ) );
 				return Variant( index.column() == 0 ? mNames[index.row()].c_str()
 													: mFiles[index.row()].c_str() );
diff --git a/src/tools/ecode/universallocator.cpp b/src/tools/ecode/universallocator.cpp
index 2d90f5a33..e173d43e1 100644
--- a/src/tools/ecode/universallocator.cpp
+++ b/src/tools/ecode/universallocator.cpp
@@ -1141,7 +1141,7 @@ void UniversalLocator::asyncFuzzyMatchTextDocumentSymbol(
 std::vector<ProjectDirectoryTree::CommandInfo> UniversalLocator::getLocatorCommands() const {
 	std::vector<ProjectDirectoryTree::CommandInfo> vec;
 	UIIcon* icon = mUISceneNode->findIcon( "chevron-right" );
-	bool isOpenFolder = mApp->getCurrentProject().empty();
+	bool isOpenFolder = !mApp->getCurrentProject().empty();
 	for ( const auto& locator : mLocatorProviders ) {
 		if ( !isOpenFolder && locator.projectNeeded )
 			continue;