diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index bb0ffb85c..1f9696852 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -52,6 +52,7 @@ const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session
     <property name="Remote" type="b" access="read"/>
     <property name="Class" type="s" access="read"/>
     <property name="Type" type="s" access="read"/>
+    <property name="State" type="s" access="read"/>
 </interface>;
 
 const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
@@ -961,6 +962,9 @@ const UserMenuButton = new Lang.Class({
                         if (proxy.Class != 'user')
                             continue;
 
+                        if (proxy.State == 'closing')
+                            continue;
+
                         if (proxy.Id == GLib.getenv('XDG_SESSION_ID'))
                             continue;