diff --git a/src/components/Actions.tsx b/src/components/Actions.tsx
index 347e3453..8806fe31 100644
--- a/src/components/Actions.tsx
+++ b/src/components/Actions.tsx
@@ -219,13 +219,17 @@ export const ShapesSwitcher = ({
           penMode: true,
         });
       }
+      const nextActiveTool = { ...activeTool, type: activeToolType };
       setAppState({
-        activeTool: { ...activeTool, type: activeToolType },
+        activeTool: nextActiveTool,
         multiElement: null,
         selectedElementIds: {},
       });
-      setCursorForShape(canvas, { ...appState, activeTool });
-      if (activeTool.type === "image") {
+      setCursorForShape(canvas, {
+        ...appState,
+        activeTool: nextActiveTool,
+      });
+      if (activeToolType === "image") {
         onImageAction({ pointerType });
       }
     },