diff --git a/apps.json b/apps.json
index 95a6feab5..877218135 100644
--- a/apps.json
+++ b/apps.json
@@ -104,7 +104,7 @@
     "id": "launch",
     "name": "Launcher",
     "shortName": "Launcher",
-    "version": "0.08",
+    "version": "0.09",
     "description": "This is needed to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.",
     "icon": "app.png",
     "type": "launch",
diff --git a/apps/launch/ChangeLog b/apps/launch/ChangeLog
index bd8a9bd03..3b9dbc30c 100644
--- a/apps/launch/ChangeLog
+++ b/apps/launch/ChangeLog
@@ -6,3 +6,5 @@
 0.06: Use Bangle.setUI for buttons
 0.07: Theme colours fix
 0.08: Merge Bangle.js 1 and 2 launchers
+0.09: Bangle.js 2 - pressing the button goes back to clock (fix #971)
+      After 10s of being locked, the launcher goes back to the clock screen
diff --git a/apps/launch/app-bangle1.js b/apps/launch/app-bangle1.js
index 3d4682e55..f779f5de4 100644
--- a/apps/launch/app-bangle1.js
+++ b/apps/launch/app-bangle1.js
@@ -64,3 +64,12 @@ Bangle.setUI("updown",dir=>{
 });
 Bangle.loadWidgets();
 Bangle.drawWidgets();
+// 10s of inactivity goes back to clock
+if (Bangle.setLocked) Bangle.setLocked(false); // unlock initially
+var lockTimeout;
+Bangle.on('lock', locked => {
+  if (lockTimeout) clearTimeout(lockTimeout);
+  lockTimeout = undefined;
+  if (locked)
+    lockTimeout = setTimeout(_=>load(), 10000);
+});
diff --git a/apps/launch/app-bangle2.js b/apps/launch/app-bangle2.js
index 8b66247c5..9a7aa81ed 100644
--- a/apps/launch/app-bangle2.js
+++ b/apps/launch/app-bangle2.js
@@ -46,3 +46,16 @@ E.showScroller({
     }
   }
 });
+
+// pressing button goes back
+setWatch(_=>load(), BTN1, {edge:"falling"});
+
+// 10s of inactivity goes back to clock
+Bangle.setLocked(false); // unlock initially
+var lockTimeout;
+Bangle.on('lock', locked => {
+  if (lockTimeout) clearTimeout(lockTimeout);
+  lockTimeout = undefined;
+  if (locked)
+    lockTimeout = setTimeout(_=>load(), 10000);
+});