diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 96e2f80b0..ff410c862 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -698,9 +698,10 @@ const ScreenShield = new Lang.Class({
     },
 
     _lockScreenShown: function() {
-        if (this._dialog)
+        if (this._dialog && !this._isGreeter) {
             this._dialog.destroy();
-        this._dialog = null;
+            this._dialog = null;
+        }
 
         if (this._arrowAnimationId)
             Mainloop.source_remove(this._arrowAnimationId);