diff --git a/kahuna/public/js/components/gr-batch-export-original-images/gr-batch-export-original-images.js b/kahuna/public/js/components/gr-batch-export-original-images/gr-batch-export-original-images.js
index 213814023f..5785022741 100644
--- a/kahuna/public/js/components/gr-batch-export-original-images/gr-batch-export-original-images.js
+++ b/kahuna/public/js/components/gr-batch-export-original-images/gr-batch-export-original-images.js
@@ -10,11 +10,11 @@ batchExportOriginalImages.controller('grBatchExportOriginalImagesCtrl', [
     function($q, $scope, $rootScope, $state, mediaCropper) {
         let ctrl = this;
 
-        const checkForFullCrops = () => ctrl.images.every(
+        const checkForFullCrops = () => ctrl.images.filter(
             image => image.data.exports.some(
               crop => crop.specification.type === 'full'
             )
-        );
+        ).size;
 
         const croppable = () => ctrl.images.filter(
           image => image.data.valid && image.data.softDeletedMetadata === undefined &&
@@ -24,7 +24,9 @@ batchExportOriginalImages.controller('grBatchExportOriginalImagesCtrl', [
         );
 
         $scope.$watchGroup(['ctrl.images', 'ctrl.cropping'], () => {
-          ctrl.allHaveFullCrops = checkForFullCrops();
+          const numberWithFullCrops = checkForFullCrops();
+          const allHaveFullCrops = numberWithFullCrops === ctrl.images.size;
+          const someHaveFullCrops = numberWithFullCrops > 0;
           const croppableImages = croppable();
 
           ctrl.allCroppable = croppableImages.size === ctrl.images.size;
@@ -32,9 +34,9 @@ batchExportOriginalImages.controller('grBatchExportOriginalImagesCtrl', [
 
           const pageIsEmbedded = window.parent !== window;
 
-          ctrl.canBatchCrop = !ctrl.allHaveFullCrops && !ctrl.cropping && !ctrl.noneCroppable;
-          ctrl.cropDisabled = !ctrl.allHaveFullCrops && !ctrl.cropping && ctrl.noneCroppable;
-          ctrl.canSelectCrops = ctrl.allHaveFullCrops && !ctrl.cropping && pageIsEmbedded;
+          ctrl.canBatchCrop = !ctrl.cropping && !allHaveFullCrops && !ctrl.noneCroppable;
+          ctrl.canSelectCrops = !ctrl.cropping && !ctrl.canBatchCrop && someHaveFullCrops && pageIsEmbedded;
+          ctrl.cropDisabled = !ctrl.cropping && !ctrl.canBatchCrop && !ctrl.canSelectCrops && ctrl.noneCroppable && !allHaveFullCrops;
         }, true);
 
         ctrl.callBatchCrop = function() {
diff --git a/kahuna/public/stylesheets/main.css b/kahuna/public/stylesheets/main.css
index 03b2e1a28b..e21ef54417 100644
--- a/kahuna/public/stylesheets/main.css
+++ b/kahuna/public/stylesheets/main.css
@@ -651,11 +651,14 @@ button[disabled],
 .inner-clickable {
     height: 100%;
     display: inline-flex;
+    gap: 2px;
     align-items: center;
 }
 
 .inner-clickable--disabled {
-  opacity: 0.7;
+  color: #9e9e9e;
+  fill: #9e9e9e;
+  cursor: default;
 }
 
 .button-right-side {
@@ -1421,6 +1424,7 @@ textarea.ng-invalid {
 
 gr-batch-export-original-images .batch-export-original-images {
   padding: 0 10px;
+  height: 100%;
 }
 
 .results-toolbar-item {