diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 35885477c..d7bf4616f 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -927,7 +927,6 @@ const ScreenShield = new Lang.Class({
             }
 
             this._dialog.connect('failed', Lang.bind(this, this._onUnlockFailed));
-            this._dialog.connect('unlocked', Lang.bind(this, this._onUnlockSucceded));
         }
 
         this._dialog.allowCancel = allowCancel;
@@ -937,10 +936,6 @@ const ScreenShield = new Lang.Class({
         this._resetLockScreen(true, false);
     },
 
-    _onUnlockSucceded: function() {
-        this.deactivate(true);
-    },
-
     _resetLockScreen: function(animateLockScreen, animateLockDialog) {
         // Don't reset the lock screen unless it is completely hidden
         // This prevents the shield going down if the lock-delay timeout
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index f09a09b05..e2646ea5c 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -223,22 +223,8 @@ const UnlockDialog = new Lang.Class({
         this._userVerifier.answerQuery(query, this._promptEntry.text);
     },
 
-    _finishUnlock: function() {
-        this._userVerifier.clear();
-        this.emit('unlocked');
-    },
-
     _onVerificationComplete: function() {
         this._userVerified = true;
-        if (!this._userVerifier.hasPendingMessages) {
-            this._finishUnlock();
-        } else {
-            let signalId = this._userVerifier.connect('no-more-messages',
-                                                      Lang.bind(this, function() {
-                                                          this._userVerifier.disconnect(signalId);
-                                                          this._finishUnlock();
-                                                      }));
-        }
     },
 
     _onReset: function() {