diff --git a/pinry/static/js/lightbox.js b/pinry/static/js/lightbox.js
index 5a16787..0dadd86 100644
--- a/pinry/static/js/lightbox.js
+++ b/pinry/static/js/lightbox.js
@@ -47,8 +47,11 @@ $(window).load(function() {
         $('.lightbox-wrapper').css({
             'width': context.image.standard.width,
             'margin-top': 70,
+            'margin-bottom': 70,
             'margin-left': -context.image.standard.width/2
         });
+        if ($('.lightbox-wrapper').height()+140 > $(window).height())
+            $('.lightbox-background').height($('.lightbox-wrapper').height()+140);
 
         box.click(function() {
             $(this).fadeOut(200);