diff --git a/js/ui/lightbox.js b/js/ui/lightbox.js
index c6261dd1d..d6b0f5d1d 100644
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@@ -102,6 +102,7 @@ const Lightbox = new Lang.Class({
 
     show: function() {
         if (this._fadeInTime) {
+            this.shown = false;
             this.actor.opacity = 0;
             Tweener.addTween(this.actor,
                              { opacity: 255 * this._fadeFactor,
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index a8401da0f..0c460bc06 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -61,6 +61,7 @@ const ScreenShield = new Lang.Class({
             this._lightbox.show();
         } else {
             let lightboxWasShown = this._lightbox.shown;
+            log("this._lightbox.shown " + this._lightbox.shown);
             this._lightbox.hide();
             if (lightboxWasShown && this._settings.get_boolean(LOCK_ENABLED_KEY)) {
                 this._background.show();