diff --git a/src/eepp/ui/tools/uicodeeditorsplitter.cpp b/src/eepp/ui/tools/uicodeeditorsplitter.cpp
index 1eb4c9549..10f928aca 100644
--- a/src/eepp/ui/tools/uicodeeditorsplitter.cpp
+++ b/src/eepp/ui/tools/uicodeeditorsplitter.cpp
@@ -1298,7 +1298,7 @@ void UICodeEditorSplitter::goForwardInNavigationHistory() {
 		}
 	}
 	if ( mNavigationHistoryPos >= mNavigationHistory.size() )
-		mNavigationHistoryPos = eemax( mNavigationHistory.size(), 0UL );
+		mNavigationHistoryPos = eemax( mNavigationHistory.size(), (size_t)0 );
 }
 
 void UICodeEditorSplitter::clearNavigationHistory() {
diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp
index 8292495b3..4138f4a53 100644
--- a/src/tools/ecode/ecode.cpp
+++ b/src/tools/ecode/ecode.cpp
@@ -2803,6 +2803,8 @@ void App::initProjectTreeView( std::string path ) {
 				} else if ( FileSystem::fileCanWrite( folderPath ) ) {
 					loadFileFromPath( path, false, nullptr, forcePosition );
 				}
+
+				mSettings->updateProjectSettingsMenu();
 			}
 		}
 	} else if ( mConfig.workspace.restoreLastSession && !mRecentFolders.empty() ) {
diff --git a/src/tools/ecode/featureshealth.cpp b/src/tools/ecode/featureshealth.cpp
index b46c0a5f4..8df4ea2e7 100644
--- a/src/tools/ecode/featureshealth.cpp
+++ b/src/tools/ecode/featureshealth.cpp
@@ -453,6 +453,8 @@ void FeaturesHealth::displayHealth( PluginManager* pluginManager, UISceneNode* s
 		healthLangInfo->setVisible( true );
 	} );
 
+	win->setKeyBindingCommand( "close-window", [win]() { win->closeWindow(); } );
+	win->addKeyBinding( { KEY_ESCAPE }, "close-window" );
 	win->showWhenReady();
 	win->center();
 }