diff --git a/js/gdm/util.js b/js/gdm/util.js
index 18866dede..aec49928d 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -13,6 +13,7 @@ const Batch = imports.gdm.batch;
 const Fprint = imports.gdm.fingerprint;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
+const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 const UserWidget = imports.ui.userWidget;
 
@@ -511,6 +512,8 @@ const AuthPrompt = new Lang.Class({
                          x_align: St.Align.START });
         this._entry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
                                      can_focus: true });
+        ShellEntry.addContextMenu(this._entry, { isPassword: true });
+
         this.actor.add(this._entry,
                        { expand: true,
                          x_fill: true,
@@ -671,6 +674,7 @@ const AuthPrompt = new Lang.Class({
 
     setPasswordChar: function(passwordChar) {
         this._entry.clutter_text.set_password_char(passwordChar);
+        this._entry.menu.isPassword = passwordChar != '';
     },
 
     setQuestion: function(question) {