diff --git a/src/locker/plugin/password.cpp b/src/locker/plugin/password.cpp
index 420468b2..1ba7c236 100644
--- a/src/locker/plugin/password.cpp
+++ b/src/locker/plugin/password.cpp
@@ -95,9 +95,12 @@ void WayfireLockerPasswordPlugin::add_output(std::string id, std::shared_ptr<Way
     /* Add to window */
     grid->attach(*widget, position);
 
-    widget->signal_realize().connect([=] ()
+    widget->property_reveal_child().signal_changed().connect([=] ()
     {
-        widget->entry.grab_focus();
+        if (widget->get_reveal_child())
+        {
+            widget->entry.grab_focus();
+        }
     });
 }