diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index e138e9e6..19c02622 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -31,6 +31,11 @@ class LightboxService extends taiga.Service
             lightbox.addClass('open')
         ), 70
 
+        lightbox.on 'click', (e) =>
+            target = angular.element(e.target)
+            if target[0] == lightbox[0]
+                @close(lightbox)
+
         $(document)
             .on 'keydown.lightbox', (e) =>
                 code = if e.keyCode then e.keyCode else e.which
@@ -38,6 +43,7 @@ class LightboxService extends taiga.Service
                 if code == 27
                     @close(lightbox)
 
+
     close: (lightbox) ->
         $(document).off('.lightbox')
         lightbox
@@ -47,7 +53,6 @@ class LightboxService extends taiga.Service
 
 module.service("lightboxService", LightboxService)
 
-
 LightboxDirective = (lightboxService) ->
     link = ($scope, $el, $attrs) ->
         $el.on "click", ".close", (event) ->