             currentLoading = $loading().target($el.find(".add-existing-button")).start()
 
             if item.milestone
-                currentLoading.finish()
-                lightboxService.close($el)
                 sprintChangeConfirmAndSave(item)
             else
                 onSuccess = ->
-                    currentLoading.finish()
-                    lightboxService.close($el)
+                    close()
                     $rootScope.$broadcast("#{$scope.objType}form:add:success", item)
                 onError = ->
-                    currentLoading.finish()
-                    lightboxService.close($el)
+                    close()
                 saveItem(item, onSuccess, onError)
 
         sprintChangeConfirmAndSave = (item) ->

            $confirm.ask(title, null, message).then (askResponse) ->
                onSuccess = ->
                    askResponse.finish()
                    lightboxService.close($el)
                    $rootScope.$broadcast("#{$scope.objType}form:add:success", item)

                onError = ->

                    createAttachments(data).then () ->
                        currentLoading.finish()
                        close()
                        if data.ref
                            $rs[schema.model].getByRef(data.project, data.ref, schema.params).then (obj) ->
                                $rootScope.$broadcast(broadcastEvent, obj)
            promise.then null, (data) ->
                currentLoading.finish()
                form.setErrors(data)
