diff --git a/src/eepp/ui/uitab.cpp b/src/eepp/ui/uitab.cpp
index 6edda009e..9a779a315 100644
--- a/src/eepp/ui/uitab.cpp
+++ b/src/eepp/ui/uitab.cpp
@@ -381,9 +381,7 @@ Uint32 UITab::onMessage( const NodeMessage* message ) {
 			break;
 		}
 		case NodeMessage::MouseUp: {
-			if ( flags & EE_BUTTON_LMASK && message->getSender() != mCloseButton ) {
-				tTabW->setTabSelected( this );
-			} else if ( tTabW->getTabsClosable() && ( flags & EE_BUTTON_MMASK ) ) {
+			if ( tTabW->getTabsClosable() && ( flags & EE_BUTTON_MMASK ) ) {
 				tTabW->tryCloseTab( this, UITabWidget::FocusTabBehavior::Closest );
 			} else if ( flags & EE_BUTTONS_WUWD ) {
 				Input* input = getInput();
diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp
index 34826be86..00d8cb483 100644
--- a/src/tools/ecode/ecode.cpp
+++ b/src/tools/ecode/ecode.cpp
@@ -3206,7 +3206,7 @@ App::getForcePositionFn( TextPosition initialPosition ) {
 	return forcePosition;
 }
 
-void App::initProjectTreeViewUI() {
+void App::initProjectViewEmptyCont() {
 	mProjectViewEmptyCont = mUISceneNode->find<UILinearLayout>( "project_view_empty" );
 	mProjectViewEmptyCont->find<UIPushButton>( "open_folder" )
 		->on( Event::MouseClick, [this]( const Event* event ) {
@@ -3219,6 +3219,10 @@ void App::initProjectTreeViewUI() {
 				createAndShowRecentFolderPopUpMenu(
 					mProjectViewEmptyCont->find<UIPushButton>( "open_recent_folder" ) );
 		} );
+}
+
+void App::initProjectTreeViewUI() {
+	initProjectViewEmptyCont();
 	mProjectTreeView = mUISceneNode->find<UITreeView>( "project_view" );
 	mProjectTreeView->setColumnsHidden(
 		{ FileSystemModel::Icon, FileSystemModel::Size, FileSystemModel::Group,
@@ -4412,6 +4416,7 @@ void App::init( InitParameters& params ) {
 		if ( params.terminal && params.file.empty() && params.fileToOpen.empty() ) {
 			showSidePanel( false );
 			showStatusBar( false );
+			initProjectViewEmptyCont();
 			mTerminalManager->createNewTerminal();
 		} else {
 			initProjectTreeView( params.file, params.openClean );
diff --git a/src/tools/ecode/ecode.hpp b/src/tools/ecode/ecode.hpp
index cb338b500..d3877c3b9 100644
--- a/src/tools/ecode/ecode.hpp
+++ b/src/tools/ecode/ecode.hpp
@@ -688,6 +688,8 @@ class App : public UICodeEditorSplitter::Client, public PluginContextProvider {
 
 	void initLocateBar();
 
+	void initProjectViewEmptyCont();
+
 	void initProjectTreeViewUI();
 
 	void initProjectTreeView( std::string path, bool openClean );