2 files changed, 4 insertions, 2 deletions

diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb
index 1275e98a74..85d5eb1fb6 100644
--- a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
 LICENSE = "GPL"
 SECTION = "x11"
 PRIORITY = "optional"
-PR = "r14"
+PR = "r15"
+RDEPENDS = "dbus-wait"
 
 SRC_URI = "file://xserver-nodm"
 S = ${WORKDIR}
diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
index ce1f53ffa7..43f7f233a6 100755
--- a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
@@ -27,7 +27,8 @@ case "$1" in
        . /etc/profile
        echo "Starting Xserver"
        /etc/X11/Xserver &
-           sleep 20
+       # Wait for the desktop to say its finished loading
+       dbus-wait org.matchbox_project.desktop Loaded
   ;;
 
   stop)