diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index f37541769..c4a23b6e9 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -616,11 +616,13 @@ const ScreenShield = new Lang.Class({
 
         this._lightbox.hide();
 
-        Main.popModal(this.actor);
-        this.actor.hide();
+        if (this._isModal) {
+            Main.popModal(this.actor);
+            this._isModal = false;
+        }
 
-        this._isModal = false;
         this._isLocked = false;
+        this.actor.hide();
 
         this.emit('lock-status-changed', false);
     },