diff --git a/apps.json b/apps.json
index e961fb456..58160824e 100644
--- a/apps.json
+++ b/apps.json
@@ -1518,7 +1518,7 @@
     "shortName": "Joystick",
     "icon": "app.png",
     "version":"0.01",
-    "description": "Emulate a 2 axis/5 button Joystick using the accelerometer as stick input and buttons 1-3, touch left and touch right.",
+    "description": "Emulate a 2 axis/5 button Joystick using the accelerometer as stick input and buttons 1-3, touch left as button 4 and touch right as button 5.",
     "tags": "bluetooth",
     "storage": [
       {"name":"hidjoystick.app.js","url":"app.js"},
diff --git a/apps/hidjoystick/app.js b/apps/hidjoystick/app.js
index fb404dd63..cc74de4f2 100644
--- a/apps/hidjoystick/app.js
+++ b/apps/hidjoystick/app.js
@@ -57,4 +57,9 @@ function update() {
 }
 
 drawApp();
-setInterval(update, 100); // 10 Hz
+if (settings.HID) {
+	setInterval(update, 100); // 10 Hz
+} else {
+	E.showMessage('HID disabled');
+	setTimeout(load, 1000);
+}