diff --git a/apps/torch/ChangeLog b/apps/torch/ChangeLog
index 27d880e78..ab3580a03 100644
--- a/apps/torch/ChangeLog
+++ b/apps/torch/ChangeLog
@@ -6,3 +6,4 @@
 0.06: Press upper left corner to exit on Bangle.js 2
 0.07: Code tweaks
 0.08: Force background of widget field to the torch colour
+0.09: Change code taking FW tweaks into account
diff --git a/apps/torch/app.js b/apps/torch/app.js
index e3f1ab89c..87f869531 100644
--- a/apps/torch/app.js
+++ b/apps/torch/app.js
@@ -16,10 +16,6 @@ g.setColor(settings.bg);
 g.fillRect(0,0,g.getWidth(),g.getHeight());
 Bangle.setUI({
   mode : 'custom',
-  back : load, // B2: Clicking the hardware button or pressing upper left corner turns off (where red back button would be)
-  btn : (n)=>{ // B1: Any button turns off
-    if (process.env.HWVERSION==1 && (n==1 || n==2 || n==3)) {
-      load();
-    }
-  }
+  back : load, // B2: SW back button to exit
+  btn : ()=>{load();}, // B1&2: HW button to exit. // A simple 'load' as on the line above did not work for btn???
 });
diff --git a/apps/torch/metadata.json b/apps/torch/metadata.json
index aff8dee37..207b2c4be 100644
--- a/apps/torch/metadata.json
+++ b/apps/torch/metadata.json
@@ -2,7 +2,7 @@
   "id": "torch",
   "name": "Torch",
   "shortName": "Torch",
-  "version": "0.08",
+  "version": "0.09",
   "description": "Turns screen white to help you see in the dark. Select from the launcher or press BTN1,BTN3,BTN1,BTN3 quickly to start when in any app that shows widgets on Bangle.js 1. You can also set the color through the app's setting menu.",
   "icon": "app.png",
   "tags": "tool,torch",