diff --git a/apps/poweroff/app.js b/apps/poweroff/app.js
index b179cfb38..6e14b1a44 100644
--- a/apps/poweroff/app.js
+++ b/apps/poweroff/app.js
@@ -2,24 +2,34 @@
 g.clear();
 
 let confirmed = false;
+// Helper function default setting
+let def = function(value, def) {
+	return value !== undefined ? value : def;
+};
 let settings = require('Storage').readJSON("poweroff.json", true) || {};
 let showPrompt;
 showPrompt = def(settings.showPrompt, true);
 
 if (showPrompt) {
+ Bangle.setLocked(false); // handy when debugging via IDE
  E.showPrompt('Are you sure?', {
   title: 'Power off',
   buttons: { Yes: true, No: false },
  }).then((confirm) => {
   if (!confirm) {
     setTimeout(load, 100);
-	confirmed = true;
     return;
   }
- });
-}
+  g.setFont("6x8",2).setFontAlign(0,0);
+  var x = g.getWidth()/2;
+  var y = g.getHeight()/2 + 10;
+  g.drawString("Powering off...", x, y);
 
-if (!showPrompt || confirmed) {
+  setTimeout(function() {
+    if (Bangle.softOff) Bangle.softOff(); else Bangle.off();
+  }, 1000);
+ });
+} else {
   g.setFont("6x8",2).setFontAlign(0,0);
   var x = g.getWidth()/2;
   var y = g.getHeight()/2 + 10;
diff --git a/apps/poweroff/settings.js b/apps/poweroff/settings.js
index b0158855c..b22a7918a 100644
--- a/apps/poweroff/settings.js
+++ b/apps/poweroff/settings.js
@@ -1,7 +1,7 @@
 (function(back) {
   var FILE = "poweroff.json";
   var settings = Object.assign({
-    secondsOnUnlock: false,
+    showPrompt: true,
   }, require('Storage').readJSON(FILE, true) || {});
 
   function writeSettings() {