diff --git a/paint/sources/ui_nodes.ts b/paint/sources/ui_nodes.ts
index 9cefe79c..b0b9ed50 100644
--- a/paint/sources/ui_nodes.ts
+++ b/paint/sources/ui_nodes.ts
@@ -886,7 +886,9 @@ function ui_nodes_render() {
 	}
 
 	if (ui_window(ui_nodes_hwnd, ui_nodes_wx, ui_nodes_wy, ui_nodes_ww, ui_nodes_wh)) {
-		ui_tab(ui_nodes_htab, tr("Nodes"), false, -1, !base_view3d_show);
+
+		let expand: bool = !base_view3d_show && config_raw.layout[layout_size_t.SIDEBAR_W] == 0;
+		ui_tab(ui_nodes_htab, expand ? tr("Nodes") + "          " : tr("Nodes"), false, -1, !base_view3d_show);
 
 		// Additional tabs
 		if (ui_nodes_canvas_type == canvas_type_t.MATERIAL) {
diff --git a/paint/sources/ui_view2d.ts b/paint/sources/ui_view2d.ts
index e209ae3f..caca5dad 100644
--- a/paint/sources/ui_view2d.ts
+++ b/paint/sources/ui_view2d.ts
@@ -115,7 +115,8 @@ function ui_view2d_render() {
 
 	if (ui_window(ui_view2d_hwnd, ui_view2d_wx, ui_view2d_wy, ui_view2d_ww, ui_view2d_wh)) {
 
-		ui_tab(ui_view2d_htab, tr("2D View"), false, -1, !base_view3d_show);
+		let expand: bool = !base_view3d_show && !ui_nodes_show && config_raw.layout[layout_size_t.SIDEBAR_W] == 0;
+		ui_tab(ui_view2d_htab, expand ? tr("2D View") + "          " : tr("2D View"), false, -1, !base_view3d_show);
 
 		if (ui_tab(ui_view2d_htab, tr("+"))) {
 			ui_view2d_htab.i = 0;