diff --git a/frontend/src/features/gallery/CurrentImageButtons.tsx b/frontend/src/features/gallery/CurrentImageButtons.tsx
index 81289cc7b6..c897dfadbd 100644
--- a/frontend/src/features/gallery/CurrentImageButtons.tsx
+++ b/frontend/src/features/gallery/CurrentImageButtons.tsx
@@ -1,8 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { isEqual } from 'lodash';
 
-import * as InvokeAI from '../../app/invokeai';
-
 import { useAppDispatch, useAppSelector } from '../../app/store';
 import { RootState } from '../../app/store';
 import {
@@ -60,7 +58,7 @@ const systemSelector = createSelector(
     const { upscalingLevel, facetoolStrength, shouldShowImageDetails } =
       options;
 
-    const { intermediateImage } = gallery;
+    const { intermediateImage, currentImage } = gallery;
 
     return {
       isProcessing,
@@ -69,7 +67,8 @@ const systemSelector = createSelector(
       isESRGANAvailable,
       upscalingLevel,
       facetoolStrength,
-      intermediateImage,
+      shouldDisableToolbarButtons: Boolean(intermediateImage) || !currentImage,
+      currentImage,
       shouldShowImageDetails,
       activeTabName,
     };
@@ -81,15 +80,11 @@ const systemSelector = createSelector(
   }
 );
 
-type CurrentImageButtonsProps = {
-  image: InvokeAI.Image;
-};
-
 /**
  * Row of buttons for common actions:
  * Use as init image, use all params, use seed, upscale, fix faces, details, delete.
  */
-const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
+const CurrentImageButtons = () => {
   const dispatch = useAppDispatch();
   const {
     isProcessing,
@@ -98,17 +93,21 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
     isESRGANAvailable,
     upscalingLevel,
     facetoolStrength,
-    intermediateImage,
+    shouldDisableToolbarButtons,
     shouldShowImageDetails,
     activeTabName,
+    currentImage,
   } = useAppSelector(systemSelector);
 
-  const { onCopy } = useClipboard(window.location.toString() + image.url);
+  const { onCopy } = useClipboard(
+    currentImage ? window.location.toString() + currentImage.url : ''
+  );
 
   const toast = useToast();
 
   const handleClickUseAsInitialImage = () => {
-    dispatch(setInitialImage(image));
+    if (!currentImage) return;
+    dispatch(setInitialImage(currentImage));
     dispatch(setActiveTab(1));
   };
 
@@ -125,7 +124,7 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
   useHotkeys(
     'shift+i',
     () => {
-      if (image) {
+      if (currentImage) {
         handleClickUseAsInitialImage();
         toast({
           title: 'Sent To Image To Image',
@@ -143,16 +142,20 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
         });
       }
     },
-    [image]
+    [currentImage]
   );
 
-  const handleClickUseAllParameters = () =>
-    image.metadata && dispatch(setAllParameters(image.metadata));
+  const handleClickUseAllParameters = () => {
+    if (!currentImage) return;
+    currentImage.metadata && dispatch(setAllParameters(currentImage.metadata));
+  };
 
   useHotkeys(
     'a',
     () => {
-      if (['txt2img', 'img2img'].includes(image?.metadata?.image?.type)) {
+      if (
+        ['txt2img', 'img2img'].includes(currentImage?.metadata?.image?.type)
+      ) {
         handleClickUseAllParameters();
         toast({
           title: 'Parameters Set',
@@ -170,15 +173,18 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
         });
       }
     },
-    [image]
+    [currentImage]
   );
 
-  const handleClickUseSeed = () =>
-    image.metadata && dispatch(setSeed(image.metadata.image.seed));
+  const handleClickUseSeed = () => {
+    currentImage?.metadata &&
+      dispatch(setSeed(currentImage.metadata.image.seed));
+  };
+
   useHotkeys(
     's',
     () => {
-      if (image?.metadata?.image?.seed) {
+      if (currentImage?.metadata?.image?.seed) {
         handleClickUseSeed();
         toast({
           title: 'Seed Set',
@@ -196,17 +202,17 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
         });
       }
     },
-    [image]
+    [currentImage]
   );
 
   const handleClickUsePrompt = () =>
-    image?.metadata?.image?.prompt &&
-    dispatch(setPrompt(image.metadata.image.prompt));
+    currentImage?.metadata?.image?.prompt &&
+    dispatch(setPrompt(currentImage.metadata.image.prompt));
 
   useHotkeys(
     'p',
     () => {
-      if (image?.metadata?.image?.prompt) {
+      if (currentImage?.metadata?.image?.prompt) {
         handleClickUsePrompt();
         toast({
           title: 'Prompt Set',
@@ -224,16 +230,19 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
         });
       }
     },
-    [image]
+    [currentImage]
   );
 
-  const handleClickUpscale = () => dispatch(runESRGAN(image));
+  const handleClickUpscale = () => {
+    currentImage && dispatch(runESRGAN(currentImage));
+  };
+
   useHotkeys(
     'u',
     () => {
       if (
         isESRGANAvailable &&
-        Boolean(!intermediateImage) &&
+        !shouldDisableToolbarButtons &&
         isConnected &&
         !isProcessing &&
         upscalingLevel
@@ -249,23 +258,25 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
       }
     },
     [
-      image,
+      currentImage,
       isESRGANAvailable,
-      intermediateImage,
+      shouldDisableToolbarButtons,
       isConnected,
       isProcessing,
       upscalingLevel,
     ]
   );
 
-  const handleClickFixFaces = () => dispatch(runFacetool(image));
+  const handleClickFixFaces = () => {
+    currentImage && dispatch(runFacetool(currentImage));
+  };
 
   useHotkeys(
     'r',
     () => {
       if (
         isGFPGANAvailable &&
-        Boolean(!intermediateImage) &&
+        !shouldDisableToolbarButtons &&
         isConnected &&
         !isProcessing &&
         facetoolStrength
@@ -281,9 +292,9 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
       }
     },
     [
-      image,
+      currentImage,
       isGFPGANAvailable,
-      intermediateImage,
+      shouldDisableToolbarButtons,
       isConnected,
       isProcessing,
       facetoolStrength,
@@ -294,7 +305,9 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
     dispatch(setShouldShowImageDetails(!shouldShowImageDetails));
 
   const handleSendToInpainting = () => {
-    dispatch(setImageToInpaint(image));
+    if (!currentImage) return;
+
+    dispatch(setImageToInpaint(currentImage));
     if (activeTabName !== 'inpainting') {
       dispatch(setActiveTab('inpainting'));
     }
@@ -309,7 +322,7 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
   useHotkeys(
     'i',
     () => {
-      if (image) {
+      if (currentImage) {
         handleClickShowImageDetails();
       } else {
         toast({
@@ -320,7 +333,7 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
         });
       }
     },
-    [image, shouldShowImageDetails]
+    [currentImage, shouldShowImageDetails]
   );
 
   return (
@@ -356,7 +369,7 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
             </IAIButton>
 
             <IAIButton leftIcon={<FaDownload />} size={'sm'}>
-              <Link download={true} href={image.url}>
+              <Link download={true} href={currentImage?.url}>
                 Download Image
               </Link>
             </IAIButton>
@@ -367,7 +380,7 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
           icon={<FaQuoteRight />}
           tooltip="Use Prompt"
           aria-label="Use Prompt"
-          isDisabled={!image?.metadata?.image?.prompt}
+          isDisabled={!currentImage?.metadata?.image?.prompt}
           onClick={handleClickUsePrompt}
         />
 
@@ -375,7 +388,7 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
           icon={<FaSeedling />}
           tooltip="Use Seed"
           aria-label="Use Seed"
-          isDisabled={!image?.metadata?.image?.seed}
+          isDisabled={!currentImage?.metadata?.image?.seed}
           onClick={handleClickUseSeed}
         />
 
@@ -384,7 +397,9 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
           tooltip="Use All"
           aria-label="Use All"
           isDisabled={
-            !['txt2img', 'img2img'].includes(image?.metadata?.image?.type)
+            !['txt2img', 'img2img'].includes(
+              currentImage?.metadata?.image?.type
+            )
           }
           onClick={handleClickUseAllParameters}
         />
@@ -400,7 +415,7 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
             <IAIButton
               isDisabled={
                 !isGFPGANAvailable ||
-                Boolean(intermediateImage) ||
+                !currentImage ||
                 !(isConnected && !isProcessing) ||
                 !facetoolStrength
               }
@@ -422,7 +437,7 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
             <IAIButton
               isDisabled={
                 !isESRGANAvailable ||
-                Boolean(intermediateImage) ||
+                !currentImage ||
                 !(isConnected && !isProcessing) ||
                 !upscalingLevel
               }
@@ -441,14 +456,12 @@ const CurrentImageButtons = ({ image }: CurrentImageButtonsProps) => {
           onClick={handleClickShowImageDetails}
         />
 
-        <DeleteImageModal image={image}>
+        <DeleteImageModal image={currentImage}>
           <IAIIconButton
             icon={<FaTrash />}
             tooltip="Delete Image"
             aria-label="Delete Image"
-            isDisabled={
-              Boolean(intermediateImage) || !isConnected || isProcessing
-            }
+            isDisabled={Boolean(currentImage) || !isConnected || isProcessing}
           />
         </DeleteImageModal>
       </ButtonGroup>
diff --git a/frontend/src/features/gallery/CurrentImageDisplay.tsx b/frontend/src/features/gallery/CurrentImageDisplay.tsx
index dcf4d09dd9..d784096f7c 100644
--- a/frontend/src/features/gallery/CurrentImageDisplay.tsx
+++ b/frontend/src/features/gallery/CurrentImageDisplay.tsx
@@ -19,10 +19,9 @@ export const currentImageDisplaySelector = createSelector(
     const { shouldShowImageDetails } = options;
 
     return {
-      currentImage,
-      intermediateImage,
       activeTabName,
       shouldShowImageDetails,
+      hasAnImageToDisplay: currentImage || intermediateImage,
     };
   },
   {
@@ -36,18 +35,16 @@ export const currentImageDisplaySelector = createSelector(
  * Displays the current image if there is one, plus associated actions.
  */
 const CurrentImageDisplay = () => {
-  const { currentImage, intermediateImage, activeTabName } = useAppSelector(
+  const { hasAnImageToDisplay, activeTabName } = useAppSelector(
     currentImageDisplaySelector
   );
 
-  const imageToDisplay = intermediateImage || currentImage;
-
   return (
     <div className="current-image-area" data-tab-name={activeTabName}>
-      {imageToDisplay ? (
+      {hasAnImageToDisplay ? (
         <>
-          <CurrentImageButtons image={imageToDisplay} />
-          <CurrentImagePreview imageToDisplay={imageToDisplay} />
+          <CurrentImageButtons />
+          <CurrentImagePreview />
         </>
       ) : (
         <div className="current-image-display-placeholder">
diff --git a/frontend/src/features/gallery/CurrentImagePreview.tsx b/frontend/src/features/gallery/CurrentImagePreview.tsx
index 0785878348..addbcc7cb7 100644
--- a/frontend/src/features/gallery/CurrentImagePreview.tsx
+++ b/frontend/src/features/gallery/CurrentImagePreview.tsx
@@ -3,7 +3,6 @@ import { useState } from 'react';
 import { FaAngleLeft, FaAngleRight } from 'react-icons/fa';
 import { RootState, useAppDispatch, useAppSelector } from '../../app/store';
 import { GalleryState, selectNextImage, selectPrevImage } from './gallerySlice';
-import * as InvokeAI from '../../app/invokeai';
 import { createSelector } from '@reduxjs/toolkit';
 import _ from 'lodash';
 import { OptionsState } from '../options/optionsSlice';
@@ -12,7 +11,7 @@ import ImageMetadataViewer from './ImageMetaDataViewer/ImageMetadataViewer';
 export const imagesSelector = createSelector(
   [(state: RootState) => state.gallery, (state: RootState) => state.options],
   (gallery: GalleryState, options: OptionsState) => {
-    const { currentCategory } = gallery;
+    const { currentCategory, currentImage, intermediateImage } = gallery;
     const { shouldShowImageDetails } = options;
 
     const tempImages = gallery.categories[currentCategory].images;
@@ -21,6 +20,7 @@ export const imagesSelector = createSelector(
     );
     const imagesLength = tempImages.length;
     return {
+      imageToDisplay: intermediateImage ? intermediateImage : currentImage,
       currentCategory,
       isOnFirstImage: currentImageIndex === 0,
       isOnLastImage:
@@ -38,16 +38,15 @@ export const imagesSelector = createSelector(
   }
 );
 
-interface CurrentImagePreviewProps {
-  imageToDisplay: InvokeAI.Image;
-}
-
-export default function CurrentImagePreview(props: CurrentImagePreviewProps) {
-  const { imageToDisplay } = props;
+export default function CurrentImagePreview() {
   const dispatch = useAppDispatch();
 
-  const { isOnFirstImage, isOnLastImage, shouldShowImageDetails } =
-    useAppSelector(imagesSelector);
+  const {
+    isOnFirstImage,
+    isOnLastImage,
+    shouldShowImageDetails,
+    imageToDisplay,
+  } = useAppSelector(imagesSelector);
 
   const [shouldShowNextPrevButtons, setShouldShowNextPrevButtons] =
     useState<boolean>(false);
@@ -67,14 +66,17 @@ export default function CurrentImagePreview(props: CurrentImagePreviewProps) {
   const handleClickNextButton = () => {
     dispatch(selectNextImage());
   };
+  console.log(imageToDisplay);
 
   return (
     <div className={'current-image-preview'}>
-      <Image
-        src={imageToDisplay.url}
-        width={imageToDisplay.width}
-        height={imageToDisplay.height}
-      />
+      {imageToDisplay && (
+        <Image
+          src={imageToDisplay.url}
+          width={imageToDisplay.width}
+          height={imageToDisplay.height}
+        />
+      )}
       {!shouldShowImageDetails && (
         <div className="current-image-next-prev-buttons">
           <div
@@ -107,7 +109,7 @@ export default function CurrentImagePreview(props: CurrentImagePreviewProps) {
           </div>
         </div>
       )}
-      {shouldShowImageDetails && (
+      {shouldShowImageDetails && imageToDisplay && (
         <ImageMetadataViewer
           image={imageToDisplay}
           styleClass="current-image-metadata"
diff --git a/frontend/src/features/gallery/DeleteImageModal.tsx b/frontend/src/features/gallery/DeleteImageModal.tsx
index 8725eda444..417aa2d393 100644
--- a/frontend/src/features/gallery/DeleteImageModal.tsx
+++ b/frontend/src/features/gallery/DeleteImageModal.tsx
@@ -50,7 +50,7 @@ interface DeleteImageModalProps {
   /**
    * The image to delete.
    */
-  image: InvokeAI.Image;
+  image?: InvokeAI.Image;
 }
 
 /**
@@ -73,7 +73,7 @@ const DeleteImageModal = forwardRef(
     };
 
     const handleDelete = () => {
-      if (isConnected && !isProcessing) {
+      if (isConnected && !isProcessing && image) {
         dispatch(deleteImage(image));
       }
       onClose();
@@ -95,7 +95,7 @@ const DeleteImageModal = forwardRef(
       <>
         {cloneElement(children, {
           // TODO: This feels wrong.
-          onClick: handleClickDelete,
+          onClick: image ? handleClickDelete : undefined,
           ref: ref,
         })}