From 581df9abd59c48aaa7be9debb0b6052711b4c11d Mon Sep 17 00:00:00 2001
From: Nathan Frank <njfoxtrot@gmail.com>
Date: Thu, 4 Dec 2025 02:47:23 -0500
Subject: [PATCH 1/9] Add the ability to toggle the dock heights from being
 individual

---
 editor/editor_node.cpp              |  6 +++++
 editor/editor_node.h                |  3 +++
 editor/gui/editor_bottom_panel.cpp  | 35 ++++++++++++++++++++++-------
 editor/gui/editor_bottom_panel.h    |  1 +
 editor/settings/editor_settings.cpp |  1 +
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 6499198e3b21..0a4fdc9248aa 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -1064,6 +1064,7 @@ void EditorNode::_notification(int p_what) {
 				theme->set_constant("dragging_unfold_wait_msec", "Tree", (float)EDITOR_GET("interface/editor/dragging_hover_wait_seconds") * 1000);
 				theme->set_constant("hover_switch_wait_msec", "TabBar", (float)EDITOR_GET("interface/editor/dragging_hover_wait_seconds") * 1000);
 				editor_dock_manager->update_tab_styles();
+				bottom_dock_tab_individual_height = EDITOR_GET("interface/editor/bottom_dock_tab_individual_height");
 			}
 
 			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/scene_tabs")) {
@@ -6356,6 +6357,10 @@ bool EditorNode::is_cmdline_mode() {
 	return singleton->cmdline_mode;
 }
 
+bool EditorNode::is_bottom_dock_tab_individual_height() {
+	return singleton->bottom_dock_tab_individual_height;
+}
+
 void EditorNode::cleanup() {
 	_init_callbacks.clear();
 }
@@ -9220,6 +9225,7 @@ EditorNode::EditorNode() {
 		}
 	}
 
+
 	follow_system_theme = EDITOR_GET("interface/theme/follow_system_theme");
 	use_system_accent_color = EDITOR_GET("interface/theme/use_system_accent_color");
 }
diff --git a/editor/editor_node.h b/editor/editor_node.h
index 3db1ec62f77a..ac3e26675b00 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -431,6 +431,7 @@ class EditorNode : public Node {
 	Callable palette_file_selected_callback;
 
 	EditorBottomPanel *bottom_panel = nullptr;
+	bool bottom_dock_tab_individual_height = false;
 
 	Tree *disk_changed_list = nullptr;
 	LocalVector<String> disk_changed_scenes;
@@ -779,6 +780,8 @@ class EditorNode : public Node {
 
 	static bool is_cmdline_mode();
 
+	static bool is_bottom_dock_tab_individual_height();
+
 	static HashMap<String, Variant> get_initial_settings();
 
 	static void cleanup();
diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp
index ebe61c954ba5..3aef0436b36e 100644
--- a/editor/gui/editor_bottom_panel.cpp
+++ b/editor/gui/editor_bottom_panel.cpp
@@ -79,13 +79,25 @@ void EditorBottomPanel::_theme_changed() {
 }
 
 void EditorBottomPanel::set_bottom_panel_offset(int p_offset) {
-	EditorDock *current_tab = Object::cast_to<EditorDock>(get_current_tab_control());
-	if (current_tab) {
-		dock_offsets[current_tab->get_effective_layout_key()] = p_offset;
+	if (EditorNode::get_singleton()->is_bottom_dock_tab_individual_height()){
+		// Store the individual offsets
+		EditorDock *current_tab = Object::cast_to<EditorDock>(get_current_tab_control());
+		if (current_tab) {
+			dock_offsets[current_tab->get_effective_layout_key()] = p_offset;
+		}
+	} else {
+		// Store the unified offset
+		dock_offset = p_offset;
 	}
 }
 
 int EditorBottomPanel::get_bottom_panel_offset() {
+	// Return the unified height
+	if (!EditorNode::get_singleton()->is_bottom_dock_tab_individual_height()) {
+		return dock_offset;
+	}
+
+	// Load the individual tab heights
 	EditorDock *current_tab = Object::cast_to<EditorDock>(get_current_tab_control());
 	if (current_tab) {
 		return dock_offsets[current_tab->get_effective_layout_key()];
@@ -127,14 +139,21 @@ void EditorBottomPanel::save_layout_to_config(Ref<ConfigFile> p_config_file, con
 		offsets[E.key] = E.value;
 	}
 	p_config_file->set_value(p_section, "bottom_panel_offsets", offsets);
+	p_config_file->set_value(p_section, "bottom_panel_offset", dock_offset);
 }
 
 void EditorBottomPanel::load_layout_from_config(Ref<ConfigFile> p_config_file, const String &p_section) {
-	const Dictionary offsets = p_config_file->get_value(p_section, "bottom_panel_offsets", Dictionary());
-	const LocalVector<Variant> offset_list = offsets.get_key_list();
-
-	for (const Variant &v : offset_list) {
-		dock_offsets[v] = offsets[v];
+	if (EditorNode::get_singleton()->is_bottom_dock_tab_individual_height()){
+		// Load the individual offsets
+		const Dictionary offsets = p_config_file->get_value(p_section, "bottom_panel_offsets", Dictionary());
+		const LocalVector<Variant> offset_list = offsets.get_key_list();
+		for (const Variant &v : offset_list) {
+			dock_offsets[v] = offsets[v];
+		}
+	} else {
+		// Load the unified offset
+		const int offset = p_config_file->get_value(p_section, "bottom_panel_offset", int());
+		dock_offset = offset;
 	}
 	_update_center_split_offset();
 }
diff --git a/editor/gui/editor_bottom_panel.h b/editor/gui/editor_bottom_panel.h
index ba9e8bf3618f..bdec768bf841 100644
--- a/editor/gui/editor_bottom_panel.h
+++ b/editor/gui/editor_bottom_panel.h
@@ -52,6 +52,7 @@ class EditorBottomPanel : public TabContainer {
 	bool lock_panel_switching = false;
 	LocalVector<EditorDock *> bottom_docks;
 	LocalVector<Ref<Shortcut>> dock_shortcuts;
+	int dock_offset;
 	HashMap<String, int> dock_offsets;
 
 	LocalVector<Button *> legacy_buttons;
diff --git a/editor/settings/editor_settings.cpp b/editor/settings/editor_settings.cpp
index 7dfe8226dde7..20eca6518b4f 100644
--- a/editor/settings/editor_settings.cpp
+++ b/editor/settings/editor_settings.cpp
@@ -446,6 +446,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/localize_settings", true, "")
 	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/dock_tab_style", 0, "Text Only,Icon Only,Text and Icon")
 	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/bottom_dock_tab_style", 0, "Text Only,Icon Only,Text and Icon")
+	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/bottom_dock_tab_individual_height", false, "");
 	EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/ui_layout_direction", 0, "Based on Application Locale,Left-to-Right,Right-to-Left,Based on System Locale", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
 
 	// Display what the Auto display scale setting effectively corresponds to.

From 1d83b95d9b6558dbe023263680ca73c50bd1a723 Mon Sep 17 00:00:00 2001
From: Nathan Frank <njfoxtrot@gmail.com>
Date: Thu, 4 Dec 2025 02:55:42 -0500
Subject: [PATCH 2/9] I forgot to run clang

---
 editor/editor_node.cpp             | 1 -
 editor/gui/editor_bottom_panel.cpp | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 0a4fdc9248aa..8a19defd67ba 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -9225,7 +9225,6 @@ EditorNode::EditorNode() {
 		}
 	}
 
-
 	follow_system_theme = EDITOR_GET("interface/theme/follow_system_theme");
 	use_system_accent_color = EDITOR_GET("interface/theme/use_system_accent_color");
 }
diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp
index 3aef0436b36e..1926ee53898c 100644
--- a/editor/gui/editor_bottom_panel.cpp
+++ b/editor/gui/editor_bottom_panel.cpp
@@ -79,7 +79,7 @@ void EditorBottomPanel::_theme_changed() {
 }
 
 void EditorBottomPanel::set_bottom_panel_offset(int p_offset) {
-	if (EditorNode::get_singleton()->is_bottom_dock_tab_individual_height()){
+	if (EditorNode::get_singleton()->is_bottom_dock_tab_individual_height()) {
 		// Store the individual offsets
 		EditorDock *current_tab = Object::cast_to<EditorDock>(get_current_tab_control());
 		if (current_tab) {
@@ -143,7 +143,7 @@ void EditorBottomPanel::save_layout_to_config(Ref<ConfigFile> p_config_file, con
 }
 
 void EditorBottomPanel::load_layout_from_config(Ref<ConfigFile> p_config_file, const String &p_section) {
-	if (EditorNode::get_singleton()->is_bottom_dock_tab_individual_height()){
+	if (EditorNode::get_singleton()->is_bottom_dock_tab_individual_height()) {
 		// Load the individual offsets
 		const Dictionary offsets = p_config_file->get_value(p_section, "bottom_panel_offsets", Dictionary());
 		const LocalVector<Variant> offset_list = offsets.get_key_list();

From dfe1fd0759430846c2a89131e5b1f270f677b9f6 Mon Sep 17 00:00:00 2001
From: Nathan Frank <njfoxtrot@gmail.com>
Date: Thu, 4 Dec 2025 03:47:13 -0500
Subject: [PATCH 3/9] Added a hook in the editor_node to force a update of the
 tab mode

---
 doc/classes/EditorSettings.xml     | 3 +++
 editor/editor_node.cpp             | 3 +++
 editor/gui/editor_bottom_panel.cpp | 5 +++++
 editor/gui/editor_bottom_panel.h   | 1 +
 4 files changed, 12 insertions(+)

diff --git a/doc/classes/EditorSettings.xml b/doc/classes/EditorSettings.xml
index 068dc9bcac0e..cd7eab3ba771 100644
--- a/doc/classes/EditorSettings.xml
+++ b/doc/classes/EditorSettings.xml
@@ -914,6 +914,9 @@
 		<member name="interface/editor/bottom_dock_tab_style" type="int" setter="" getter="">
 			Tab style of editor docks located at the bottom.
 		</member>
+		<member name="interface/editor/bottom_dock_tab_individual_height" type="bool" setter="" getter="">
+			If the editor docks located at the bottom should have individual heights.
+		</member>
 		<member name="interface/editor/code_font" type="String" setter="" getter="">
 			The font to use for the script editor. Must be a resource of a [Font] type such as a [code].ttf[/code] or [code].otf[/code] font file.
 		</member>
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 8a19defd67ba..12887b762245 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -1064,7 +1064,10 @@ void EditorNode::_notification(int p_what) {
 				theme->set_constant("dragging_unfold_wait_msec", "Tree", (float)EDITOR_GET("interface/editor/dragging_hover_wait_seconds") * 1000);
 				theme->set_constant("hover_switch_wait_msec", "TabBar", (float)EDITOR_GET("interface/editor/dragging_hover_wait_seconds") * 1000);
 				editor_dock_manager->update_tab_styles();
+
 				bottom_dock_tab_individual_height = EDITOR_GET("interface/editor/bottom_dock_tab_individual_height");
+				get_bottom_panel()->_editor_settings_changed();
+
 			}
 
 			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/scene_tabs")) {
diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp
index 1926ee53898c..2d3b15593b36 100644
--- a/editor/gui/editor_bottom_panel.cpp
+++ b/editor/gui/editor_bottom_panel.cpp
@@ -78,6 +78,11 @@ void EditorBottomPanel::_theme_changed() {
 	}
 }
 
+void EditorBottomPanel::_editor_settings_changed() {
+	_update_center_split_offset();
+}
+
+
 void EditorBottomPanel::set_bottom_panel_offset(int p_offset) {
 	if (EditorNode::get_singleton()->is_bottom_dock_tab_individual_height()) {
 		// Store the individual offsets
diff --git a/editor/gui/editor_bottom_panel.h b/editor/gui/editor_bottom_panel.h
index bdec768bf841..754f6dc1abdb 100644
--- a/editor/gui/editor_bottom_panel.h
+++ b/editor/gui/editor_bottom_panel.h
@@ -80,6 +80,7 @@ class EditorBottomPanel : public TabContainer {
 	void toggle_last_opened_bottom_panel();
 	void set_expanded(bool p_expanded);
 	void _theme_changed();
+	void _editor_settings_changed();
 
 	void set_bottom_panel_offset(int p_offset);
 	int get_bottom_panel_offset();

From 71ff9aa1d768bc15c089bfba255593345d4f18fd Mon Sep 17 00:00:00 2001
From: Nathan Frank <njfoxtrot@gmail.com>
Date: Thu, 4 Dec 2025 03:49:54 -0500
Subject: [PATCH 4/9] clang...

---
 editor/gui/editor_bottom_panel.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp
index 2d3b15593b36..cb8ff879bb04 100644
--- a/editor/gui/editor_bottom_panel.cpp
+++ b/editor/gui/editor_bottom_panel.cpp
@@ -82,7 +82,6 @@ void EditorBottomPanel::_editor_settings_changed() {
 	_update_center_split_offset();
 }
 
-
 void EditorBottomPanel::set_bottom_panel_offset(int p_offset) {
 	if (EditorNode::get_singleton()->is_bottom_dock_tab_individual_height()) {
 		// Store the individual offsets

From 0ba4eacd32e5bfca4b776697fcdf0d0309c7ca4f Mon Sep 17 00:00:00 2001
From: Nathan Frank <njfoxtrot@gmail.com>
Date: Thu, 4 Dec 2025 03:51:20 -0500
Subject: [PATCH 5/9] I am setting up pre-commit hooks right now.

---
 editor/editor_node.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 12887b762245..b2e71e71cc1d 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -1067,7 +1067,6 @@ void EditorNode::_notification(int p_what) {
 
 				bottom_dock_tab_individual_height = EDITOR_GET("interface/editor/bottom_dock_tab_individual_height");
 				get_bottom_panel()->_editor_settings_changed();
-
 			}
 
 			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/scene_tabs")) {

From 983a1f5fd978a4f0b7020929d4c24795efd7936f Mon Sep 17 00:00:00 2001
From: Nathan Frank <njfoxtrot@gmail.com>
Date: Thu, 4 Dec 2025 04:08:10 -0500
Subject: [PATCH 6/9] Ran --doctool to fix ordering of editor settings docs.

---
 doc/classes/EditorSettings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/classes/EditorSettings.xml b/doc/classes/EditorSettings.xml
index cd7eab3ba771..b75f569ad782 100644
--- a/doc/classes/EditorSettings.xml
+++ b/doc/classes/EditorSettings.xml
@@ -911,12 +911,12 @@
 		<member name="interface/editor/automatically_open_screenshots" type="bool" setter="" getter="">
 			If [code]true[/code], automatically opens screenshots with the default program associated to [code].png[/code] files after a screenshot is taken using the [b]Editor &gt; Take Screenshot[/b] action.
 		</member>
-		<member name="interface/editor/bottom_dock_tab_style" type="int" setter="" getter="">
-			Tab style of editor docks located at the bottom.
-		</member>
 		<member name="interface/editor/bottom_dock_tab_individual_height" type="bool" setter="" getter="">
 			If the editor docks located at the bottom should have individual heights.
 		</member>
+		<member name="interface/editor/bottom_dock_tab_style" type="int" setter="" getter="">
+			Tab style of editor docks located at the bottom.
+		</member>
 		<member name="interface/editor/code_font" type="String" setter="" getter="">
 			The font to use for the script editor. Must be a resource of a [Font] type such as a [code].ttf[/code] or [code].otf[/code] font file.
 		</member>

From e8111e7730b2c29b2f18a820e48757ac51aa7122 Mon Sep 17 00:00:00 2001
From: Nathan Frank <njfoxtrot@gmail.com>
Date: Thu, 4 Dec 2025 15:46:31 -0500
Subject: [PATCH 7/9] Set default mode and fixed edge cases

---
 doc/classes/EditorSettings.xml      |  6 +--
 editor/editor_node.cpp              |  7 +--
 editor/editor_node.h                |  4 +-
 editor/gui/editor_bottom_panel.cpp  | 71 +++++++++++++++++++----------
 editor/gui/editor_bottom_panel.h    |  2 +-
 editor/settings/editor_settings.cpp |  2 +-
 6 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/doc/classes/EditorSettings.xml b/doc/classes/EditorSettings.xml
index b75f569ad782..90099e82b2d9 100644
--- a/doc/classes/EditorSettings.xml
+++ b/doc/classes/EditorSettings.xml
@@ -911,12 +911,12 @@
 		<member name="interface/editor/automatically_open_screenshots" type="bool" setter="" getter="">
 			If [code]true[/code], automatically opens screenshots with the default program associated to [code].png[/code] files after a screenshot is taken using the [b]Editor &gt; Take Screenshot[/b] action.
 		</member>
-		<member name="interface/editor/bottom_dock_tab_individual_height" type="bool" setter="" getter="">
-			If the editor docks located at the bottom should have individual heights.
-		</member>
 		<member name="interface/editor/bottom_dock_tab_style" type="int" setter="" getter="">
 			Tab style of editor docks located at the bottom.
 		</member>
+		<member name="interface/editor/bottom_dock_tabs_allow_individual_heights" type="bool" setter="" getter="">
+			Allow the editor docks located at the bottom to have individual heights.
+		</member>
 		<member name="interface/editor/code_font" type="String" setter="" getter="">
 			The font to use for the script editor. Must be a resource of a [Font] type such as a [code].ttf[/code] or [code].otf[/code] font file.
 		</member>
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index b2e71e71cc1d..359e1fea6e9a 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -1065,7 +1065,7 @@ void EditorNode::_notification(int p_what) {
 				theme->set_constant("hover_switch_wait_msec", "TabBar", (float)EDITOR_GET("interface/editor/dragging_hover_wait_seconds") * 1000);
 				editor_dock_manager->update_tab_styles();
 
-				bottom_dock_tab_individual_height = EDITOR_GET("interface/editor/bottom_dock_tab_individual_height");
+				bottom_dock_tabs_allow_individual_heights = EDITOR_GET("interface/editor/bottom_dock_tabs_allow_individual_heights");
 				get_bottom_panel()->_editor_settings_changed();
 			}
 
@@ -6359,8 +6359,8 @@ bool EditorNode::is_cmdline_mode() {
 	return singleton->cmdline_mode;
 }
 
-bool EditorNode::is_bottom_dock_tab_individual_height() {
-	return singleton->bottom_dock_tab_individual_height;
+bool EditorNode::is_bottom_dock_tabs_allow_individual_heights() {
+	return singleton->bottom_dock_tabs_allow_individual_heights;
 }
 
 void EditorNode::cleanup() {
@@ -8814,6 +8814,7 @@ EditorNode::EditorNode() {
 		Dictionary offsets;
 		offsets["Audio"] = -450;
 		default_layout->set_value(EDITOR_NODE_CONFIG_SECTION, "bottom_panel_offsets", offsets);
+		default_layout->set_value(EDITOR_NODE_CONFIG_SECTION, "bottom_panel_offset", -450);
 	}
 
 	_update_layouts_menu();
diff --git a/editor/editor_node.h b/editor/editor_node.h
index ac3e26675b00..ac007ca18aae 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -431,7 +431,7 @@ class EditorNode : public Node {
 	Callable palette_file_selected_callback;
 
 	EditorBottomPanel *bottom_panel = nullptr;
-	bool bottom_dock_tab_individual_height = false;
+	bool bottom_dock_tabs_allow_individual_heights = false;
 
 	Tree *disk_changed_list = nullptr;
 	LocalVector<String> disk_changed_scenes;
@@ -780,7 +780,7 @@ class EditorNode : public Node {
 
 	static bool is_cmdline_mode();
 
-	static bool is_bottom_dock_tab_individual_height();
+	static bool is_bottom_dock_tabs_allow_individual_heights();
 
 	static HashMap<String, Variant> get_initial_settings();
 
diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp
index cb8ff879bb04..a696c85d4e35 100644
--- a/editor/gui/editor_bottom_panel.cpp
+++ b/editor/gui/editor_bottom_panel.cpp
@@ -79,34 +79,49 @@ void EditorBottomPanel::_theme_changed() {
 }
 
 void EditorBottomPanel::_editor_settings_changed() {
+	// If the editor settings were changed to disable individual tabs, then set the
+	// unified tab height to be equal to the currently active tab height
+	if (!EditorNode::get_singleton()->is_bottom_dock_tabs_allow_individual_heights()) {
+		EditorDock *current_tab = Object::cast_to<EditorDock>(get_current_tab_control());
+		if (current_tab) {
+			dock_offset = dock_offsets[current_tab->get_effective_layout_key()];
+		}
+	}
+
 	_update_center_split_offset();
 }
 
 void EditorBottomPanel::set_bottom_panel_offset(int p_offset) {
-	if (EditorNode::get_singleton()->is_bottom_dock_tab_individual_height()) {
-		// Store the individual offsets
+	// Store the individual offsets
+	if (EditorNode::get_singleton()->is_bottom_dock_tabs_allow_individual_heights()) {
 		EditorDock *current_tab = Object::cast_to<EditorDock>(get_current_tab_control());
 		if (current_tab) {
 			dock_offsets[current_tab->get_effective_layout_key()] = p_offset;
 		}
-	} else {
-		// Store the unified offset
-		dock_offset = p_offset;
+		return;
+	}
+
+	// Store the unified offset and update all individual offsets to match
+	dock_offset = p_offset;
+	for (const KeyValue<String, int> &E : dock_offsets) {
+		dock_offsets[E.key] = p_offset;
 	}
 }
 
 int EditorBottomPanel::get_bottom_panel_offset() {
-	// Return the unified height
-	if (!EditorNode::get_singleton()->is_bottom_dock_tab_individual_height()) {
-		return dock_offset;
+	// Handle the null case
+	EditorDock *current_tab = Object::cast_to<EditorDock>(get_current_tab_control());
+	if (!current_tab) {
+		return 0;
 	}
 
-	// Load the individual tab heights
-	EditorDock *current_tab = Object::cast_to<EditorDock>(get_current_tab_control());
-	if (current_tab) {
+	// Return the individual offsets
+	if (EditorNode::get_singleton()->is_bottom_dock_tabs_allow_individual_heights()) {
 		return dock_offsets[current_tab->get_effective_layout_key()];
 	}
-	return 0;
+
+	// Return the unified offset
+	return dock_offset;
 }
 
 void EditorBottomPanel::_repaint() {
@@ -139,26 +154,32 @@ void EditorBottomPanel::_repaint() {
 
 void EditorBottomPanel::save_layout_to_config(Ref<ConfigFile> p_config_file, const String &p_section) const {
 	Dictionary offsets;
-	for (const KeyValue<String, int> &E : dock_offsets) {
-		offsets[E.key] = E.value;
+	if (EditorNode::get_singleton()->is_bottom_dock_tabs_allow_individual_heights()) {
+		// Store the individual offsets as themselves
+		for (const KeyValue<String, int> &E : dock_offsets) {
+			offsets[E.key] = E.value;
+		}
+	} else {
+		// Store the individual offsets as the unified offset
+		for (const KeyValue<String, int> &E : dock_offsets) {
+			offsets[E.key] = dock_offset;
+		}
 	}
 	p_config_file->set_value(p_section, "bottom_panel_offsets", offsets);
 	p_config_file->set_value(p_section, "bottom_panel_offset", dock_offset);
 }
 
 void EditorBottomPanel::load_layout_from_config(Ref<ConfigFile> p_config_file, const String &p_section) {
-	if (EditorNode::get_singleton()->is_bottom_dock_tab_individual_height()) {
-		// Load the individual offsets
-		const Dictionary offsets = p_config_file->get_value(p_section, "bottom_panel_offsets", Dictionary());
-		const LocalVector<Variant> offset_list = offsets.get_key_list();
-		for (const Variant &v : offset_list) {
-			dock_offsets[v] = offsets[v];
-		}
-	} else {
-		// Load the unified offset
-		const int offset = p_config_file->get_value(p_section, "bottom_panel_offset", int());
-		dock_offset = offset;
+	// Load the unified offset
+	dock_offset = p_config_file->get_value(p_section, "bottom_panel_offset", int());
+
+	// Load the individual offsets
+	const Dictionary offsets = p_config_file->get_value(p_section, "bottom_panel_offsets", Dictionary());
+	const LocalVector<Variant> offset_list = offsets.get_key_list();
+	for (const Variant &v : offset_list) {
+		dock_offsets[v] = offsets[v];
 	}
+
 	_update_center_split_offset();
 }
 
diff --git a/editor/gui/editor_bottom_panel.h b/editor/gui/editor_bottom_panel.h
index 754f6dc1abdb..d2367dd574d2 100644
--- a/editor/gui/editor_bottom_panel.h
+++ b/editor/gui/editor_bottom_panel.h
@@ -52,7 +52,7 @@ class EditorBottomPanel : public TabContainer {
 	bool lock_panel_switching = false;
 	LocalVector<EditorDock *> bottom_docks;
 	LocalVector<Ref<Shortcut>> dock_shortcuts;
-	int dock_offset;
+	int dock_offset = 0;
 	HashMap<String, int> dock_offsets;
 
 	LocalVector<Button *> legacy_buttons;
diff --git a/editor/settings/editor_settings.cpp b/editor/settings/editor_settings.cpp
index 20eca6518b4f..767afd64d641 100644
--- a/editor/settings/editor_settings.cpp
+++ b/editor/settings/editor_settings.cpp
@@ -446,7 +446,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/localize_settings", true, "")
 	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/dock_tab_style", 0, "Text Only,Icon Only,Text and Icon")
 	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/bottom_dock_tab_style", 0, "Text Only,Icon Only,Text and Icon")
-	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/bottom_dock_tab_individual_height", false, "");
+	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "interface/editor/bottom_dock_tabs_allow_individual_heights", false, "");
 	EDITOR_SETTING_USAGE(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/ui_layout_direction", 0, "Based on Application Locale,Left-to-Right,Right-to-Left,Based on System Locale", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
 
 	// Display what the Auto display scale setting effectively corresponds to.

From 2fef1d763b6ca7efccd8e138e6a46d78e1b57e12 Mon Sep 17 00:00:00 2001
From: Nathan Frank <njfoxtrot@gmail.com>
Date: Thu, 4 Dec 2025 16:12:49 -0500
Subject: [PATCH 8/9] Fixed transition from individual -> unified mode and back

---
 editor/gui/editor_bottom_panel.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp
index a696c85d4e35..e84bd7202aa6 100644
--- a/editor/gui/editor_bottom_panel.cpp
+++ b/editor/gui/editor_bottom_panel.cpp
@@ -88,6 +88,17 @@ void EditorBottomPanel::_editor_settings_changed() {
 		}
 	}
 
+	// If the editor settings were changed to enable individual tabs, then set the
+	// individual tab heights to be equal to the current unified height and set
+	else {
+		for (int tab_idx = 0; tab_idx < get_tab_count(); tab_idx++) {
+			EditorDock *tab = Object::cast_to<EditorDock>(get_tab_control(tab_idx));
+			if (tab) {
+				dock_offsets[tab->get_effective_layout_key()] = dock_offset;
+			}
+		}
+	}
+
 	_update_center_split_offset();
 }
 

From 01986bf828f8cef43972ec44f51f8d9a44e7ddf6 Mon Sep 17 00:00:00 2001
From: Nathan Frank <njfoxtrot@gmail.com>
Date: Thu, 4 Dec 2025 16:17:51 -0500
Subject: [PATCH 9/9] Changed default value of unified dock height

---
 editor/gui/editor_bottom_panel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/gui/editor_bottom_panel.h b/editor/gui/editor_bottom_panel.h
index d2367dd574d2..383c5ffde2f5 100644
--- a/editor/gui/editor_bottom_panel.h
+++ b/editor/gui/editor_bottom_panel.h
@@ -52,7 +52,7 @@ class EditorBottomPanel : public TabContainer {
 	bool lock_panel_switching = false;
 	LocalVector<EditorDock *> bottom_docks;
 	LocalVector<Ref<Shortcut>> dock_shortcuts;
-	int dock_offset = 0;
+	int dock_offset = -450;
 	HashMap<String, int> dock_offsets;
 
 	LocalVector<Button *> legacy_buttons;