diff -ruN lxde-common-0.99.0.orig/lxde-logout.in lxde-common-0.99.0/lxde-logout.in
--- lxde-common-0.99.0.orig/lxde-logout.in	2014-09-01 16:17:11.000000000 +0200
+++ lxde-common-0.99.0/lxde-logout.in	2015-04-24 13:16:07.053603465 +0200
@@ -1,2 +1,23 @@
 #!/bin/sh
+show-desktop-file.sh
+OLD_LXSESSION_PID=$_LXSESSION_PID
+export OLD_LXSESSION_PID
+_LXSESSION_PID=`ps -f --user $USER | grep -- "/usr/lib/systemd/systemd --user" | grep -v grep | awk -F ' ' '{print $2}'`
+export _LXSESSION_PID
+if [ -z "$_LXSESSION_PID" ]; then
+	_LXSESSION_PID=$OLD_LXSESSION_PID
+	export _LXSESSION_PID
+	unset OLD_LXSESSION_PID
+fi
 lxsession-logout --banner "@prefix@/share/lxde/images/logout-banner.png" --side=top
+sleep 1
+if [ -z "`ps --no-headers $_LXSESSION_PID`" ]; then
+	kill `ps -f --user $USER | grep -- "/usr/bin/gnome-keyring-daemon --daemonize --login" | grep -v grep | awk -F ' ' '{print $2}'`
+	kill `ps -f --user $USER | grep -- "/usr/bin/ssh-agent -s" | grep -v grep | awk -F ' ' '{print $2}'`
+	kill $OLD_LXSESSION_PID
+else
+	hide-desktop-file.sh
+	_LXSESSION_PID=$OLD_LXSESSION_PID
+	export _LXSESSION_PID
+	unset OLD_LXSESSION_PID
+fi