(cherry picked from commit 56734f44e58b8c94b04c0d90ddb931a01a30f75d)
@@ -648,6 +648,10 @@ void TabContainer::remove_child_notify(Node *p_child) {
Container::remove_child_notify(p_child);
+ if (!Object::cast_to<Control>(p_child)) {
+ return;
+ }
+
call_deferred("_update_current_tab");
p_child->disconnect("renamed", this, "_child_renamed_callback");