diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index a192458e2..166a1a384 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -489,8 +489,8 @@ var ScreenShield = class {
 
         this._lockDialogGroup.grab_key_focus();
 
-        if (Main.sessionMode.currentMode != 'lock-screen')
-            Main.sessionMode.pushMode('lock-screen');
+        if (Main.sessionMode.currentMode != 'unlock-dialog')
+            Main.sessionMode.pushMode('unlock-dialog');
     }
 
     _lockScreenShown(params) {
@@ -547,8 +547,6 @@ var ScreenShield = class {
     _continueDeactivate(animate) {
         this._hideLockScreen();
 
-        if (Main.sessionMode.currentMode == 'lock-screen')
-            Main.sessionMode.popMode('lock-screen');
         if (Main.sessionMode.currentMode == 'unlock-dialog')
             Main.sessionMode.popMode('unlock-dialog');
 
@@ -614,8 +612,7 @@ var ScreenShield = class {
 
         this.actor.show();
 
-        if (Main.sessionMode.currentMode != 'unlock-dialog' &&
-            Main.sessionMode.currentMode != 'lock-screen') {
+        if (Main.sessionMode.currentMode != 'unlock-dialog') {
             this._isGreeter = Main.sessionMode.isGreeter;
             if (!this._isGreeter)
                 Main.sessionMode.pushMode('unlock-dialog');
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index e47bb97b1..5716ecac3 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -53,19 +53,6 @@ const _modes = {
         panelStyle: 'login-screen'
     },
 
-    'lock-screen': {
-        isLocked: true,
-        isGreeter: undefined,
-        unlockDialog: undefined,
-        components: ['polkitAgent', 'telepathyClient'],
-        panel: {
-            left: [],
-            center: [],
-            right: ['aggregateMenu']
-        },
-        panelStyle: 'lock-screen'
-    },
-
     'unlock-dialog': {
         isLocked: true,
         unlockDialog: undefined,