diff --git a/paint/sources/globals.h b/paint/sources/globals.h
index b1abc2d9..b8a3612f 100644
--- a/paint/sources/globals.h
+++ b/paint/sources/globals.h
@@ -313,7 +313,8 @@ slot_layer_t   *render_path_paint_live_layer        = NULL;
 i32             render_path_paint_live_layer_drawn  = 0;
 bool            render_path_paint_live_layer_locked = false;
 bool            render_path_paint_push_undo_last;
-bool            ui_box_show = false;
+bool            render_path_paint_baking = false;
+bool            ui_box_show              = false;
 ui_handle_t    *ui_box_hwnd;
 bool            ui_box_click_to_hide = true;
 i32             ui_box_modalw        = 400;
diff --git a/paint/sources/main.c b/paint/sources/main.c
index efbaf7f1..8b9455db 100644
--- a/paint/sources/main.c
+++ b/paint/sources/main.c
@@ -326,9 +326,11 @@ void _kickstart() {
 	        _tr("Material"),
 	        _tr("Cursor"),
 	        _tr("Select"),
+	        _tr("Bake"), // Hidden, used by Bake Texture node
 	    },
-	    13);
+	    14);
 	gc_root(ui_toolbar_tool_names);
+	ui_toolbar_tool_names->length--; // Hide Bake tool
 
 	ui_toolbar_tooltip_extras = any_array_create_from_raw(
 	    (void *[]){
diff --git a/paint/sources/nodes_material/bake_texture_node.c b/paint/sources/nodes_material/bake_texture_node.c
index 3a475c48..27cf5e55 100644
--- a/paint/sources/nodes_material/bake_texture_node.c
+++ b/paint/sources/nodes_material/bake_texture_node.c
@@ -13,7 +13,7 @@ static void bake_texture_node_clear(gpu_texture_t *t) {
 static void bake_texture_node_check_result(ui_node_t *node) {
 	ui_nodes_hwnd->redraws = 2;
 
-	if (g_context->pdirty > 0) {
+	if (g_context->pdirty > 0 || render_path_paint_baking) {
 		return;
 	}
 
diff --git a/paint/sources/render/render_path_paint.c b/paint/sources/render/render_path_paint.c
index 113621bf..6ef74407 100644
--- a/paint/sources/render/render_path_paint.c
+++ b/paint/sources/render/render_path_paint.c
@@ -7,7 +7,6 @@ mesh_object_t   *render_path_paint_planeo                = NULL;
 u8_array_t      *render_path_paint_visibles              = NULL;
 bool             render_path_paint_merged_object_visible = false;
 f32              render_path_paint_saved_fov             = 0.0;
-bool             render_path_paint_baking                = false;
 render_target_t *_render_path_paint_texpaint;
 render_target_t *_render_path_paint_texpaint_nor;
 render_target_t *_render_path_paint_texpaint_pack;