diff --git a/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbar.tsx b/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbar.tsx
index 8d875eb899..2d5079ed65 100644
--- a/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbar.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbar.tsx
@@ -98,9 +98,9 @@ export const StagingAreaToolbar = memo(() => {
     onPrev,
     {
       preventDefault: true,
-      enabled: isCanvasActive,
+      enabled: isCanvasActive && shouldShowStagedImage && imageCount > 1,
     },
-    [isCanvasActive]
+    [isCanvasActive, shouldShowStagedImage, imageCount]
   );
 
   useHotkeys(
@@ -108,9 +108,9 @@ export const StagingAreaToolbar = memo(() => {
     onNext,
     {
       preventDefault: true,
-      enabled: isCanvasActive,
+      enabled: isCanvasActive && shouldShowStagedImage && imageCount > 1,
     },
-    [isCanvasActive]
+    [isCanvasActive, shouldShowStagedImage, imageCount]
   );
 
   useHotkeys(
@@ -118,9 +118,9 @@ export const StagingAreaToolbar = memo(() => {
     onAccept,
     {
       preventDefault: true,
-      enabled: isCanvasActive,
+      enabled: isCanvasActive && shouldShowStagedImage && imageCount > 1,
     },
-    [isCanvasActive]
+    [isCanvasActive, shouldShowStagedImage, imageCount]
   );
 
   const counterText = useMemo(() => {