diff --git a/frontend/src/features/canvas/store/canvasSlice.ts b/frontend/src/features/canvas/store/canvasSlice.ts
index f5de2bf2d4..f71083ae17 100644
--- a/frontend/src/features/canvas/store/canvasSlice.ts
+++ b/frontend/src/features/canvas/store/canvasSlice.ts
@@ -689,6 +689,7 @@ export const canvasSlice = createSlice({
     },
     commitColorPickerColor: (state) => {
       state.brushColor = state.colorPickerColor;
+      state.tool = 'brush';
     },
     setMergedCanvas: (state, action: PayloadAction<CanvasImage>) => {
       state.pastLayerStates.push({