diff --git a/Sources/arm/Layers.hx b/Sources/arm/Layers.hx
index fb212c75..38043ac1 100644
--- a/Sources/arm/Layers.hx
+++ b/Sources/arm/Layers.hx
@@ -490,10 +490,12 @@ class Layers {
 		var current = @:privateAccess kha.graphics4.Graphics2.current;
 		if (current != null) current.end();
 
-		var selectedTool = Context.tool;
+		var _tool = Context.tool;
+		Context.tool = ToolFill;
 		Context.pdirty = fills;
 		Context.layerIsMask = false;
-		Context.tool = ToolFill;
+		var _workspace = UIHeader.inst.worktab.position;
+		UIHeader.inst.worktab.position = SpacePaint;
 
 		// Decal layer
 		if (Context.layer.uvType == UVProject) {
@@ -507,7 +509,8 @@ class Layers {
 		}
 
 		Context.rdirty = 2;
-		Context.tool = selectedTool;
+		Context.tool = _tool;
+		UIHeader.inst.worktab.position = _workspace;
 		if (current != null) current.begin(false);
 	}
 
diff --git a/Sources/arm/data/LayerSlot.hx b/Sources/arm/data/LayerSlot.hx
index 5ab64922..2c30b39d 100644
--- a/Sources/arm/data/LayerSlot.hx
+++ b/Sources/arm/data/LayerSlot.hx
@@ -425,7 +425,7 @@ class LayerSlot {
 	public function toFillLayer() {
 		Context.setLayer(this);
 		fill_layer = Context.material;
-		Layers.updateFillLayers(4);
+		Layers.updateFillLayer(4);
 		function _parse(_) {
 			MakeMaterial.parsePaintMaterial();
 			Context.layerPreviewDirty = true;