diff --git a/editor/src/messages/tool/tool_messages/shape_tool.rs b/editor/src/messages/tool/tool_messages/shape_tool.rs
index 43895d0d70..33b2a2dff2 100644
--- a/editor/src/messages/tool/tool_messages/shape_tool.rs
+++ b/editor/src/messages/tool/tool_messages/shape_tool.rs
@@ -941,8 +941,6 @@ impl Fsm for ShapeToolFsmState {
 
 				let defered_responses = &mut VecDeque::new();
 
-				tool_options.stroke.apply_stroke(tool_options.line_weight, layer, defered_responses);
-
 				match tool_data.current_shape {
 					ShapeType::Polygon | ShapeType::Star | ShapeType::Circle | ShapeType::Arc | ShapeType::Spiral | ShapeType::Grid | ShapeType::Rectangle | ShapeType::Ellipse => {
 						defered_responses.add(GraphOperationMessage::TransformSet {
@@ -951,17 +949,19 @@ impl Fsm for ShapeToolFsmState {
 							transform_in: TransformIn::Viewport,
 							skip_rerender: false,
 						});
-
+						tool_options.stroke.apply_stroke(tool_options.line_weight, layer, defered_responses);
 						tool_options.fill.apply_fill(layer, defered_responses);
 					}
 					ShapeType::Arrow => {
 						tool_data.line_data.weight = tool_options.line_weight;
 						tool_data.line_data.editing_layer = Some(layer);
+						tool_options.stroke.apply_stroke(tool_options.line_weight, layer, defered_responses);
 						tool_options.fill.apply_fill(layer, defered_responses);
 					}
 					ShapeType::Line => {
 						tool_data.line_data.weight = tool_options.line_weight;
 						tool_data.line_data.editing_layer = Some(layer);
+						tool_options.stroke.apply_stroke(tool_options.line_weight, layer, defered_responses);
 					}
 				}