diff --git a/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx b/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
index 3425c73a4c55..23f13d310586 100644
--- a/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
+++ b/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
@@ -88,7 +88,7 @@ export function ScreenshotEditorFactory({
     const [croppingRect, setCroppingRect] = hooks.useState<Box>({ startX: 0, startY: 0, endX: 0, endY: 0 });
     const [confirmCrop, setConfirmCrop] = hooks.useState(false);
     const [isResizing, setIsResizing] = hooks.useState(false);
-    const [isCropping, setIsCropping] = hooks.useState(false);
+    const [isCropping, setIsCropping] = hooks.useState(true);
     const [isAnnotating, setIsAnnotating] = hooks.useState(false);
 
     hooks.useEffect(() => {
@@ -491,24 +491,24 @@ export function ScreenshotEditorFactory({
             <div />
             <div class="editor__tool-bar">
               <button
-                class={`editor__tool ${isAnnotating ? 'editor__tool--active' : ''}`}
+                class={`editor__tool ${isCropping ? 'editor__tool--active' : ''}`}
                 onClick={e => {
                   e.preventDefault();
-                  setIsAnnotating(!isAnnotating);
-                  setIsCropping(false);
+                  setIsCropping(!isCropping);
+                  setIsAnnotating(false);
                 }}
               >
-                <PenIcon />
+                <CropIcon />
               </button>
               <button
-                class={`editor__tool ${isCropping ? 'editor__tool--active' : ''}`}
+                class={`editor__tool ${isAnnotating ? 'editor__tool--active' : ''}`}
                 onClick={e => {
                   e.preventDefault();
-                  setIsCropping(!isCropping);
-                  setIsAnnotating(false);
+                  setIsAnnotating(!isAnnotating);
+                  setIsCropping(false);
                 }}
               >
-                <CropIcon />
+                <PenIcon />
               </button>
             </div>
             <div />