--- unity-settings-daemon-15.04.1+15.04.20150408/plugins/power/gsd-power-manager.c	2015-04-08 16:46:38.000000000 +0200
+++ unity-settings-daemon-15.04.1+15.04.20150408.new/plugins/power/gsd-power-manager.c	2015-05-19 20:09:07.422581968 +0200
@@ -3330,6 +3330,8 @@
                           G_CALLBACK (lid_state_changed_cb), manager);
         g_signal_connect (manager->priv->up_client, "notify::on-battery",
                           G_CALLBACK (up_client_on_battery_cb), manager);
+        g_signal_connect_after (manager->priv->up_client, "notify::on-battery",
+                          G_CALLBACK (lid_state_changed_cb), manager);
 
         /* connect to UPower for keyboard backlight control */
         g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,