diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js
index 38f5a836d..a2010b39e 100644
--- a/js/ui/shellEntry.js
+++ b/js/ui/shellEntry.js
@@ -39,6 +39,10 @@ var EntryMenu = class extends PopupMenu.PopupMenu {
         item.connect('activate', this._onPasswordActivated.bind(this));
         this.addMenuItem(item);
         this._passwordItem = item;
+
+        this._entry.bind_property('show-peek-icon',
+            this._passwordItem, 'visible',
+            GObject.BindingFlags.SYNC_CREATE);
     }
 
     open(animate) {