diff --git a/config/emulators/tools.conf b/config/emulators/tools.conf
index 787dc59e27..7e4eae9971 100644
--- a/config/emulators/tools.conf
+++ b/config/emulators/tools.conf
@@ -5,7 +5,7 @@ SYSTEM_RELEASE="System"
 SYSTEM_HARDWARE="System"
 SYSTEM_PATH="/storage/.config/modules"
 SYSTEM_EXTENSION=".sh"
-SYSTEM_COMMAND="/usr/bin/run %ROM%"
+SYSTEM_COMMAND="%RUNCOMMAND%"
 SYSTEM_PLATFORM="tools"
 SYSTEM_THEME="tools"
 SYSTEM_WIKI_PATH="tools"
diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk
index 624bd3926c..05b96747e0 100644
--- a/packages/ui/emulationstation/package.mk
+++ b/packages/ui/emulationstation/package.mk
@@ -133,7 +133,7 @@ makeinstall_target() {
                 <hardware>system</hardware>
                 <path>/storage/.config/modules</path>
                 <extension>.sh</extension>
-                <command>/usr/bin/run %ROM%</command>
+                <command>%ROM%</command>
                 <platform>tools</platform>
                 <theme>tools</theme>
         </system>
diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk
index 5ba027f058..8f60483b98 100644
--- a/packages/virtual/emulators/package.mk
+++ b/packages/virtual/emulators/package.mk
@@ -1249,6 +1249,13 @@ makeinstall_target() {
   mkdir -p ${INSTALL}/usr/config/emulationstation
   cp -f ${ESTMP}/es_systems.cfg ${INSTALL}/usr/config/emulationstation
 
+  if [ "${DISPLAYSERVER}" = "wl" ]
+  then
+    sed -i 's/%RUNCOMMAND%/weston-terminal --command="%ROM%"/g' ${INSTALL}/usr/config/emulationstation/es_systems.cfg
+  else
+    sed -i 's/%RUNCOMMAND%/%ROM%/g' ${INSTALL}/usr/config/emulationstation/es_systems.cfg
+  fi
+
   ### Automount should handle this.
   cp -f ${ESTMP}/system-dirs.conf ${INSTALL}/usr/config
 
@@ -1258,5 +1265,6 @@ makeinstall_target() {
   mkdir -p ${INSTALL}/usr/lib/autostart/common
   cp ${PKG_DIR}/autostart/* ${INSTALL}/usr/lib/autostart/common
   chmod 0755 ${INSTALL}/usr/lib/autostart/common/*
+ 
 }