diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
index 9880833c44..abcdb0852f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
@@ -87,6 +87,14 @@ angular.module('umbraco')
                 reader.readAsDataURL(args.files[0]);
             }
         });
+
+        var unsubscribe = $scope.$on("formSubmitting", function () {
+            $scope.done();
+        });
+
+        $scope.$on('$destroy', function () {
+            unsubscribe();
+        });
     })
     .run(function (mediaHelper, umbRequestHelper) {
         if (mediaHelper && mediaHelper.registerFileResolver) {