diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index 32f0178b..6e7be726 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -37,10 +37,10 @@ class LightboxService extends taiga.Service
 
                 if code == 27
                     @close(lightbox)
-                    $(document).off('lightbox')
 
 
     close: (lightbox) ->
+        $(document).off('.lightbox')
         lightbox
             .one "transitionend", () ->
                 lightbox.css('display', 'none')
diff --git a/app/coffee/modules/taskboard/lightboxes.coffee b/app/coffee/modules/taskboard/lightboxes.coffee
index 982baaf1..be471ae1 100644
--- a/app/coffee/modules/taskboard/lightboxes.coffee
+++ b/app/coffee/modules/taskboard/lightboxes.coffee
@@ -104,10 +104,6 @@ CreateBulkTasksDirective = ($repo, $rs, $rootscope, lightboxService) ->
             lightboxService.open($el)
             $scope.form = {data: "", sprintId: sprintId, usId: usId}
 
-        $el.on "click", ".close", (event) ->
-            event.preventDefault()
-            lightboxService.close($el)
-
         $el.on "click", ".button-green", (event) ->
             event.preventDefault()