diff --git a/src/components/tools/crop/Crop3D.vue b/src/components/tools/crop/Crop3D.vue
index 4d7e0568..08ee562a 100644
--- a/src/components/tools/crop/Crop3D.vue
+++ b/src/components/tools/crop/Crop3D.vue
@@ -50,8 +50,6 @@ export default defineComponent({
     const view = inject(VtkViewContext);
     if (!view) throw new Error('No VtkView');
 
-    console.log('whee');
-
     const { widgetManager } = view;
 
     const { imageId } = toRefs(props);
diff --git a/src/components/tools/crop/CropTool.vue b/src/components/tools/crop/CropTool.vue
index 9a6ffa2d..73a38a2a 100644
--- a/src/components/tools/crop/CropTool.vue
+++ b/src/components/tools/crop/CropTool.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { useViewStore } from '@/src/store/views';
 import { PropType, computed, defineComponent, toRefs } from 'vue';
-import { watchImmediate } from '@vueuse/core';
+import { wheneverImageLoaded } from '@/src/composables/wheneverImageLoaded';
 import { useCropStore } from '@/src/store/tools/crop';
 import { useToolStore } from '@/src/store/tools';
 import { Tools } from '@/src/store/tools/types';
@@ -29,7 +29,7 @@ export default defineComponent({
 
     const active = computed(() => toolStore.currentTool === Tools.Crop);
 
-    watchImmediate(imageId, (id) => {
+    wheneverImageLoaded(imageId, ({ id }) => {
       if (id && !(id in cropStore.croppingByImageID)) {
         cropStore.resetCropping(id);
       }
diff --git a/src/composables/wheneverImageLoaded.ts b/src/composables/wheneverImageLoaded.ts
new file mode 100644
index 00000000..7b45bc67
--- /dev/null
+++ b/src/composables/wheneverImageLoaded.ts
@@ -0,0 +1,25 @@
+import { useImageStore } from '@/src/store/datasets-images';
+import { Maybe } from '@/src/types';
+import vtkImageData from '@kitware/vtk.js/Common/DataModel/ImageData';
+import { whenever } from '@vueuse/core';
+import { computed, Ref, WatchCallback } from 'vue';
+
+export function wheneverImageLoaded(
+  imageId: Ref<Maybe<string>>,
+  cb: WatchCallback<{ id: string; imageData: vtkImageData }>
+) {
+  const imageStore = useImageStore();
+  const hasImageData = computed(() => {
+    const id = imageId.value;
+    if (!id) return false;
+    return !!imageStore.dataIndex[id];
+  });
+
+  return whenever(hasImageData, (newVal, oldVal, onCleanup) => {
+    cb(
+      { id: imageId.value!, imageData: imageStore.dataIndex[imageId.value!] },
+      undefined,
+      onCleanup
+    );
+  });
+}