diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 3338dcc0d..881d66706 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -398,6 +398,7 @@ const ScreenShield = new Lang.Class({
                                       Lang.bind(this, this._onLockScreenKeyRelease));
         this._lockScreenGroup.connect('scroll-event',
                                       Lang.bind(this, this._onLockScreenScroll));
+        Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic');
 
         this._lockScreenContents = new St.Widget({ layout_manager: new Clutter.BinLayout(),
                                                    name: 'lockScreenContents' });
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 2f46d648e..9996385a3 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -200,6 +200,8 @@ const UnlockDialog = new Lang.Class({
             return false;
         }));
 
+        Main.ctrlAltTabManager.addGroup(this.dialogLayout, _("Unlock Window"), 'dialog-password-symbolic');
+
         this._idleMonitor = new GnomeDesktop.IdleMonitor();
         this._idleWatchId = this._idleMonitor.add_watch(IDLE_TIMEOUT * 1000, Lang.bind(this, this._escape));
     },