diff --git a/usr/lib/raspi-config/cmstart.sh b/usr/lib/raspi-config/cmstart.sh
index 90bd615..3ee1d34 100755
--- a/usr/lib/raspi-config/cmstart.sh
+++ b/usr/lib/raspi-config/cmstart.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-if grep -q okay /proc/device-tree/soc/v3d@7ec00000/status 2> /dev/null || grep -q okay /proc/device-tree/v3dbus/v3d@7ec04000/status 2> /dev/null || grep -q okay /proc/device-tree/soc/firmwarekms@7e600000/status 2> /dev/null ; then
+if raspi-config nonint is_kms ; then
     if ps ax | grep -v grep | grep -q openbox ; then
         exec xcompmgr -a
     fi