diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 3ee24ebbc..81d9655ee 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -760,6 +760,10 @@ const ScreenShield = new Lang.Class({
     },
 
     _resetLockScreen: function(animateLockScreen, animateLockDialog) {
+        if (this._lockScreenState == MessageTray.State.SHOWING ||
+            this._lockScreenState == MessageTray.State.SHOWN)
+            return;
+
         this._ensureLockScreen();
         this._lockDialogGroup.scale_x = 1;
         this._lockDialogGroup.scale_y = 1;