diff --git a/SOURCES/0029-spice-vdagent.desktop-Change-autostart-to-WindowMana.patch b/SOURCES/0029-spice-vdagent.desktop-Change-autostart-to-WindowMana.patch
new file mode 100644
index 0000000..d0272ec
--- /dev/null
+++ b/SOURCES/0029-spice-vdagent.desktop-Change-autostart-to-WindowMana.patch
@@ -0,0 +1,39 @@
+From d0aeaff0dae4c7eb7fcb88d2d33c667364e870de Mon Sep 17 00:00:00 2001
+From: Victor Toso <me@victortoso.com>
+Date: Tue, 4 Sep 2018 10:51:42 +0200
+Subject: [PATCH] spice-vdagent.desktop: Change autostart to WindowManager
+ stage
+
+It is possible that g_get_user_special_dir() return NULL for
+G_USER_DIRECTORY_DESKTOP or G_USER_DIRECTORY_DOWNLOAD; This is a sure
+thing to happen in case xdg-user-dirs hasn't been run yet.
+
+Keeping spice-vdagent to run on Initialization stage of
+X-GNOME-Autostart-Phase could trigger a race with xdg-user-dirs that
+also runs on Initialization, which is the earliest stage possible.
+
+Moving to spice-vdagent to run WindowManager stage avoids the race
+with xdg-user-dirs and still runs before any graphical application.
+
+Tested also moving to Desktop stage, which is 4th stage (out of 5) and
+worked without apparent drawbacks.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1623947
+Signed-off-by: Victor Toso <victortoso@redhat.com>
+---
+ data/spice-vdagent.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/spice-vdagent.desktop b/data/spice-vdagent.desktop
+index d152c12..260dace 100644
+--- a/data/spice-vdagent.desktop
++++ b/data/spice-vdagent.desktop
+@@ -5,4 +5,4 @@ Exec=/usr/bin/spice-vdagent
+ Terminal=false
+ Type=Application
+ Categories=
+-X-GNOME-Autostart-Phase=Initialization
++X-GNOME-Autostart-Phase=WindowManager
+-- 
+2.17.1
+
diff --git a/SPECS/spice-vdagent.spec b/SPECS/spice-vdagent.spec
index 251106e..9e4631b 100644
--- a/SPECS/spice-vdagent.spec
+++ b/SPECS/spice-vdagent.spec
@@ -1,6 +1,6 @@
 Name:           spice-vdagent
 Version:        0.14.0
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Agent for Spice guests
 Group:          Applications/System
 License:        GPLv3+
@@ -38,6 +38,7 @@ Patch25: 0025-session-info-check-for-a-locked-session.patch
 Patch26: 0026-session-info-check-if-session-belongs-to-user.patch
 Patch27: 0027-systemd-login-check-for-LockedHint-property.patch
 Patch28: 0028-Add-systemd-socket-activation.patch
+Patch29: 0029-spice-vdagent.desktop-Change-autostart-to-WindowMana.patch
 BuildRequires:  systemd-devel glib2-devel spice-protocol >= 0.12.6
 BuildRequires:  libpciaccess-devel libXrandr-devel libXinerama-devel
 BuildRequires:  libXfixes-devel systemd-units desktop-file-utils libtool
@@ -89,6 +90,7 @@ Features:
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
 autoreconf -fi
 
 
@@ -130,6 +132,10 @@ rm $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/spice-vdagentd.conf
 
 
 %changelog
+* Fri Sep  7 2018 Victor Toso <victortoso@redhat.com> - 0.14.0-16
+- Change session agent initialization stage to WindowManager
+  Resolves: rhbz#1623947
+
 * Fri Nov 17 2017 Jonathon Jongsma <jjongsma@redhat.com> - 0.14.0-15
 - Add systemd socket activation
   Resolves: rhbz#1340160