diff --git a/apps/calculator/ChangeLog b/apps/calculator/ChangeLog
index f3ce3a928..2e1ace7bf 100644
--- a/apps/calculator/ChangeLog
+++ b/apps/calculator/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Display current operation on LHS
 0.05: Grid positioning and swipe controls to switch between numbers, operators and special (for Bangle.js 2)
 0.06: Bangle.js 2: Exit with a short press of the physical button
+0.07: Bangle.js 2: Exit by pressing upper left corner of the screen
diff --git a/apps/calculator/README.md b/apps/calculator/README.md
index b25d355bf..8681965f2 100644
--- a/apps/calculator/README.md
+++ b/apps/calculator/README.md
@@ -12,12 +12,20 @@ Basic calculator reminiscent of MacOs's one. Handy for small calculus.
 
 ## Controls
 
+Bangle.js 1
 - UP: BTN1
 - DOWN: BTN3
 - LEFT: BTN4
 - RIGHT: BTN5
 - SELECT: BTN2
 
+Bangle.js 2
+- Swipes to change visible buttons
+- Click physical button exit
+- Press upper left corner of screen to exit (where the red back button would be)
 ## Creator
 
 <https://twitter.com/fredericrous>
+
+## Contributors
+[thyttan](https://github.com/thyttan)
diff --git a/apps/calculator/app.js b/apps/calculator/app.js
index 571a5b27f..f31b591ad 100644
--- a/apps/calculator/app.js
+++ b/apps/calculator/app.js
@@ -402,6 +402,10 @@ if (process.env.HWVERSION==1) {
   swipeEnabled = false;
   drawGlobal();
 } else { // touchscreen?
+  Bangle.setUI({ // Pressing upper left corner turns off (where red back button would be)
+    mode : 'custom',
+    back : load
+  });
   setWatch(_ => {load();}, BTN1, {edge:'falling'}); // Exit with a short press to physical button
   selected = "NONE";
   swipeEnabled = true;
diff --git a/apps/calculator/metadata.json b/apps/calculator/metadata.json
index 536a6955e..1674b7843 100644
--- a/apps/calculator/metadata.json
+++ b/apps/calculator/metadata.json
@@ -2,7 +2,7 @@
   "id": "calculator",
   "name": "Calculator",
   "shortName": "Calculator",
-  "version": "0.06",
+  "version": "0.07",
   "description": "Basic calculator reminiscent of MacOs's one. Handy for small calculus.",
   "icon": "calculator.png",
   "screenshots": [{"url":"screenshot_calculator.png"}],