diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index 6edb2694a..9a8cf44bf 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -85,12 +85,19 @@ var AuthPrompt = GObject.registerClass({
 
         this._initEntryRow();
 
+        let capsLockPlaceholder = new St.Label();
+        this.add_child(capsLockPlaceholder);
+
         this._capsLockWarningLabel = new ShellEntry.CapsLockWarning({
             x_expand: true,
             x_align: Clutter.ActorAlign.CENTER,
         });
         this.add_child(this._capsLockWarningLabel);
 
+        this._capsLockWarningLabel.bind_property('visible',
+            capsLockPlaceholder, 'visible',
+            GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.INVERT_BOOLEAN);
+
         this._message = new St.Label({
             opacity: 0,
             styleClass: 'login-dialog-message',