diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 96ade17b0..50a20cd6b 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -566,11 +566,6 @@ var ScreenShield = class {
     }
 
     _lockScreenShown(params) {
-        if (this._dialog && !this._isGreeter) {
-            this._dialog.destroy();
-            this._dialog = null;
-        }
-
         let motionId = global.stage.connect('captured-event', (stage, event) => {
             if (event.type() == Clutter.EventType.MOTION) {
                 this._cursorTracker.set_pointer_visible(true);
@@ -699,6 +694,8 @@ var ScreenShield = class {
         if (this._activationTime == 0)
             this._activationTime = GLib.get_monotonic_time();
 
+        this._ensureUnlockDialog(true);
+
         this.actor.show();
 
         if (Main.sessionMode.currentMode != 'unlock-dialog' &&