diff --git a/.ecode/project_build.json b/.ecode/project_build.json
index c3321c7f6..e59e5e1f5 100644
--- a/.ecode/project_build.json
+++ b/.ecode/project_build.json
@@ -456,7 +456,7 @@
     },
     "run": [
       {
-        "args": "-x",
+        "args": "",
         "command": "${project_root}/bin/ecode-debug",
         "name": "ecode-debug",
         "working_dir": "${project_root}/bin/"
diff --git a/src/eepp/ui/doc/textdocument.cpp b/src/eepp/ui/doc/textdocument.cpp
index 90868c84e..92a14addb 100644
--- a/src/eepp/ui/doc/textdocument.cpp
+++ b/src/eepp/ui/doc/textdocument.cpp
@@ -1669,7 +1669,7 @@ std::vector<bool> TextDocument::autoCloseBrackets( const String& text ) {
 	for ( size_t i = 0; i < mSelection.size(); ++i ) {
 		auto& sel = mSelection[i];
 		if ( sel.hasSelection() ) {
-			replaceSelection( i, sAutoCloseBracketsPairs[pos].first + getSelectedText() +
+			replaceSelection( i, sAutoCloseBracketsPairs[pos].first + getSelectedText( i ) +
 									 sAutoCloseBracketsPairs[pos].second );
 			inserted.push_back( true );
 		} else if ( mAutoCloseBrackets ) {
diff --git a/src/tools/ecode/settingsmenu.cpp b/src/tools/ecode/settingsmenu.cpp
index f5cebdbee..0c6140140 100644
--- a/src/tools/ecode/settingsmenu.cpp
+++ b/src/tools/ecode/settingsmenu.cpp
@@ -1585,11 +1585,6 @@ UIMenu* SettingsMenu::createViewMenu() {
 							if ( mApp->getConfig().editor.hideTabBar )
 								mApp->getConfig().editor.tabSwitcher = true;
 							tabBarMenuRefresh();
-						} else if ( "hide-tabbar-on-single-tab" == item->getId() ) {
-							mApp->getConfig().editor.hideTabBarOnSingleTab =
-								item->asType<UIMenuCheckBox>()->isActive();
-							mSplitter->setHideTabBarOnSingleTab(
-								mApp->getConfig().editor.hideTabBarOnSingleTab );
 						} else if ( "tab-switcher" == item->getId() ) {
 							mApp->getConfig().editor.tabSwitcher =
 								item->asType<UIMenuCheckBox>()->isActive();
@@ -1650,12 +1645,6 @@ UIMenu* SettingsMenu::createViewMenu() {
 								"Enables the color picker tool when a double click selection\n"
 								"is done over a word representing a color." ) )
 		->setId( "enable-color-picker" );
-	mViewMenu->addCheckBox( i18n( "hide_tabbar_on_single_tab", "Hide tabbar on single tab" ) )
-		->setActive( mApp->getConfig().editor.hideTabBarOnSingleTab )
-		->setTooltipText(
-			i18n( "hide_tabbar_on_single_tab_tooltip",
-				  "Hides the tabbar if there's only one element in the tab widget." ) )
-		->setId( "hide-tabbar-on-single-tab" );
 	mViewMenu->addCheckBox( i18n( "treeview_single_click_nav", "Single Click Navigation" ) )
 		->setActive( mApp->getConfig().editor.singleClickNavigation )
 		->setTooltipText( i18n( "treeview_single_click_nav_tooltip",