diff --git a/packages/mediacenter/xbmc/scripts/xbmc-session b/packages/mediacenter/xbmc/scripts/xbmc-session
index 40e0603dbf..dcf8231cf8 100755
--- a/packages/mediacenter/xbmc/scripts/xbmc-session
+++ b/packages/mediacenter/xbmc/scripts/xbmc-session
@@ -13,13 +13,13 @@ fi
 
 while true; do
 
-  [ $START_WM="yes" ] && $WINDOWMANAGER &
+  [ "$START_WM" = "yes" ] && $WINDOWMANAGER &
 
-  $XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1
+  $IONICE $XBMC_BIN $XBMC_ARGS $@ > /dev/null 2>&1
   RET=$?
   echo "Exited with code $RET"
 
-  [ "$RET" == 0 ] && break
+  [ "$RET" == 0 ] && sync && poweroff
   [ "$RET" == 64 ] && sync && poweroff
   [ "$RET" == 66 ] && sync && reboot