diff --git a/public/javascripts/widgets/lightbox.js b/public/javascripts/widgets/lightbox.js
index 8b1e7fd6a906fd29cbb9ae42f7aaaad41b201932..409ade1f1b805d2fb5f5fa4074a6d28cdc49a703 100644
--- a/public/javascripts/widgets/lightbox.js
+++ b/public/javascripts/widgets/lightbox.js
@@ -43,6 +43,8 @@ jQuery.fn.center = (function() {
         evt.preventDefault();
         self.resetLightbox();
       });
+      self.backdrop.click(self.resetLightbox);
+      self.lightbox.click(self.resetLightbox);
 
       self.body.keydown(function(evt) {
 
@@ -82,7 +84,7 @@ jQuery.fn.center = (function() {
 
     this.lightboxImageClicked = function(evt) {
       evt.preventDefault();
-      
+
       var selectedImage = $(this).find("img.stream-photo"),
           imageUrl = selectedImage.attr("data-full-photo"),
           images = selectedImage.parents('.stream_element').find('img.stream-photo'),
@@ -110,7 +112,7 @@ jQuery.fn.center = (function() {
 
     this.imagesetImageClicked = function(evt) { 
       evt.preventDefault();
-     
+      evt.stopPropagation();
 
       self.selectImage($(this));
     };