diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index a8285c91f..2e6c76997 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -77,3 +77,4 @@ of 'Select Clock'
 	calibration was done.
 0.67: Rename 'Wake on BTN1/Touch' to 'Wake on Button/Tap' on Bangle.js 2
 0.68: Fix syntax error
+0.69: Add option to wake on double tap
\ No newline at end of file
diff --git a/apps/setting/metadata.json b/apps/setting/metadata.json
index d7c442fb6..1a850af83 100644
--- a/apps/setting/metadata.json
+++ b/apps/setting/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.68",
+  "version": "0.69",
   "description": "A menu for setting up Bangle.js",
   "icon": "settings.png",
   "tags": "tool,system",
diff --git a/apps/setting/settings.js b/apps/setting/settings.js
index a259a7862..7726822f4 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -14,7 +14,7 @@ function updateOptions() {
   var o = settings.options;
   // Check to make sure nobody disabled all wakeups and locked themselves out!
   if (BANGLEJS2) {
-    if (!(o.wakeOnBTN1||o.wakeOnFaceUp||o.wakeOnTouch||o.wakeOnTwist)) {
+    if (!(o.wakeOnBTN1||o.wakeOnFaceUp||o.wakeOnTouch||o.wakeOnDoubleTap||o.wakeOnTwist)) {
       o.wakeOnBTN1 = true;
     }
   } else {
@@ -451,48 +451,58 @@ function showLCDMenu() {
     }
   });
 
-  if (BANGLEJS2)
+  if (BANGLEJS2) {
     Object.assign(lcdMenu, {
       /*LANG*/'Wake on Button': {
-        value: settings.options.wakeOnBTN1,
+        value: !!settings.options.wakeOnBTN1,
         onchange: () => {
           settings.options.wakeOnBTN1 = !settings.options.wakeOnBTN1;
           updateOptions();
         }
       },
       /*LANG*/'Wake on Tap': {
-        value: settings.options.wakeOnTouch,
+        value: !!settings.options.wakeOnTouch,
         onchange: () => {
           settings.options.wakeOnTouch = !settings.options.wakeOnTouch;
           updateOptions();
         }
       }
     });
-  else
+    if (process.env.VERSION.replace("v",0)>=2020)
+      Object.assign(lcdMenu, {
+        /*LANG*/'Wake on Double Tap': {
+          value: !!settings.options.wakeOnDoubleTap,
+          onchange: () => {
+            settings.options.wakeOnDoubleTap = !settings.options.wakeOnDoubleTap;
+            updateOptions();
+          }
+        }
+      });
+  } else
     Object.assign(lcdMenu, {
      /*LANG*/'Wake on BTN1': {
-      value: settings.options.wakeOnBTN1,
+      value: !!settings.options.wakeOnBTN1,
       onchange: () => {
         settings.options.wakeOnBTN1 = !settings.options.wakeOnBTN1;
         updateOptions();
       }
     },
     /*LANG*/'Wake on BTN2': {
-      value: settings.options.wakeOnBTN2,
+      value: !!settings.options.wakeOnBTN2,
       onchange: () => {
         settings.options.wakeOnBTN2 = !settings.options.wakeOnBTN2;
         updateOptions();
       }
     },
     /*LANG*/'Wake on BTN3': {
-      value: settings.options.wakeOnBTN3,
+      value: !!settings.options.wakeOnBTN3,
       onchange: () => {
         settings.options.wakeOnBTN3 = !settings.options.wakeOnBTN3;
         updateOptions();
       }
     },
     /*LANG*/'Wake on Touch': {
-      value: settings.options.wakeOnTouch,
+      value: !!settings.options.wakeOnTouch,
       onchange: () => {
         settings.options.wakeOnTouch = !settings.options.wakeOnTouch;
         updateOptions();
@@ -500,14 +510,14 @@ function showLCDMenu() {
     }});
   Object.assign(lcdMenu, {
     /*LANG*/'Wake on FaceUp': {
-      value: settings.options.wakeOnFaceUp,
+      value: !!settings.options.wakeOnFaceUp,
       onchange: () => {
         settings.options.wakeOnFaceUp = !settings.options.wakeOnFaceUp;
         updateOptions();
       }
     },
     /*LANG*/'Wake on Twist': {
-      value: settings.options.wakeOnTwist,
+      value: !!settings.options.wakeOnTwist,
       onchange: () => {
         settings.options.wakeOnTwist = !settings.options.wakeOnTwist;
         updateOptions();