1 files changed, 12 insertions, 10 deletions

diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp
index 3a3a84b481..12f91a9873 100644
--- a/scene/gui/tab_container.cpp
+++ b/scene/gui/tab_container.cpp
@@ -233,7 +233,7 @@ void TabContainer::_repaint() {
 
 		if (i == current) {
 			c->show();
-			c->set_anchors_and_offsets_preset(Control::PRESET_WIDE);
+			c->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
 
 			if (tabs_visible) {
 				c->set_offset(SIDE_TOP, _get_top_margin());
@@ -312,7 +312,7 @@ Vector<Control *> TabContainer::_get_tab_controls() const {
 	Vector<Control *> controls;
 	for (int i = 0; i < get_child_count(); i++) {
 		Control *control = Object::cast_to<Control>(get_child(i));
-		if (!control || control->is_set_as_top_level() || control == tab_bar) {
+		if (!control || control->is_set_as_top_level() || control == tab_bar || control == child_removing) {
 			continue;
 		}
 
@@ -523,7 +523,7 @@ void TabContainer::move_child_notify(Node *p_child) {
 	Control *c = Object::cast_to<Control>(p_child);
 	if (c && !c->is_set_as_top_level()) {
 		int old_idx = -1;
-		String tab_name = c->has_meta("_tab_name") ? String(c->get_meta("_tab_name")) : String(c->get_name());
+		String tab_name = String(c->get_meta("_tab_name", c->get_name()));
 
 		// Find the previous tab index of the control.
 		for (int i = 0; i < get_tab_count(); i++) {
@@ -549,16 +549,19 @@ void TabContainer::remove_child_notify(Node *p_child) {
 		return;
 	}
 
-	tab_bar->remove_tab(get_tab_idx_from_control(c));
+	int idx = get_tab_idx_from_control(c);
+
+	// Before this, the tab control has not changed; after this, the tab control has changed.
+	child_removing = p_child;
+	tab_bar->remove_tab(idx);
+	child_removing = nullptr;
 
 	_update_margins();
 	if (get_tab_count() == 0) {
 		update();
 	}
 
-	if (p_child->has_meta("_tab_name")) {
-		p_child->remove_meta("_tab_name");
-	}
+	p_child->remove_meta("_tab_name");
 	p_child->disconnect("renamed", callable_mp(this, &TabContainer::_refresh_tab_names));
 
 	// TabBar won't emit the "tab_changed" signal when not inside the tree.
@@ -679,9 +682,7 @@ void TabContainer::set_tab_title(int p_tab, const String &p_title) {
 	tab_bar->set_tab_title(p_tab, p_title);
 
 	if (p_title == child->get_name()) {
-		if (child->has_meta("_tab_name")) {
-			child->remove_meta("_tab_name");
-		}
+		child->remove_meta("_tab_name");
 	} else {
 		child->set_meta("_tab_name", p_title);
 	}
@@ -731,6 +732,7 @@ void TabContainer::set_tab_hidden(int p_tab, bool p_hidden) {
 	if (!get_clip_tabs()) {
 		update_minimum_size();
 	}
+	call_deferred(SNAME("_repaint"));
 }
 
 bool TabContainer::is_tab_hidden(int p_tab) const {