diff --git a/packages/x11/xserver/xorg-server/system.d/xorg.service b/packages/x11/xserver/xorg-server/system.d/xorg.service
index 52f9bf678a..bc1b45fe9b 100644
--- a/packages/x11/xserver/xorg-server/system.d/xorg.service
+++ b/packages/x11/xserver/xorg-server/system.d/xorg.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Xorg Server
-Before=graphical.target
+Before=graphical.target xbmc.service
 After=multi-user.target
 
 ConditionPathExists=/run/openelec/xorg-settings.conf
@@ -10,6 +10,8 @@ EnvironmentFile=/run/openelec/xorg-settings.conf
 EnvironmentFile=-/run/openelec/debug/xorg.conf
 ExecStart=/usr/bin/Xorg vt01 $XORG_ARGS $XORG_DEBUG
 Restart=always
+RestartSec=2
+StartLimitInterval=0
 
 [Install]
 WantedBy=graphical.target