diff --git a/apps/alarm/ChangeLog b/apps/alarm/ChangeLog
index 41dd93081..9daf7bcbf 100644
--- a/apps/alarm/ChangeLog
+++ b/apps/alarm/ChangeLog
@@ -24,3 +24,4 @@
 0.23: Fix regression with Days of Week (#1735)
 0.24: Automatically save the alarm/timer when the user returns to the main menu using the back arrow
       Add "Enable All", "Disable All" and "Remove All" actions
+0.25: Fix redrawing selected Alarm/Timer entry inside edit submenu
diff --git a/apps/alarm/app.js b/apps/alarm/app.js
index 3b3421115..d454e85dd 100644
--- a/apps/alarm/app.js
+++ b/apps/alarm/app.js
@@ -45,10 +45,9 @@ function showMainMenu() {
     } else txt = type+txt;
     // add to menu
     menu[txt] = {
-      value : "\0"+atob(alarm.on?"EhKBAH//v/////////////5//x//j//H+eP+Mf/A//h//z//////////3//g":"EhKBAH//v//8AA8AA8AA8AA8AA8AA8AA8AA8AA8AA8AA8AA8AA8AA///3//g"),
+      value : alarm.on,
       onchange : function() {
-        if (alarm.timer) editTimer(idx, alarm);
-        else editAlarm(idx, alarm);
+        setTimeout(alarm.timer ? editTimer : editAlarm, 10, idx, alarm);
       }
     };
   });
@@ -76,7 +75,6 @@ function editDOW(dow, onchange) {
     let dayOfWeek = require("locale").dow({ getDay: () => i });
     menu[dayOfWeek] = {
       value: !!(dow&(1<<i)),
-      format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
       onchange: v => v ? dow |= 1<<i : dow &= ~(1<<i),
     };
   })(i);
@@ -106,12 +104,10 @@ function editAlarm(alarmIndex, alarm) {
     },
     /*LANG*/'Enabled': {
       value: a.on,
-      format: v => v ? /*LANG*/"On" : /*LANG*/"Off",
       onchange: v=>a.on=v
     },
     /*LANG*/'Repeat': {
       value: a.rp,
-      format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
       onchange: v => a.rp = v
     },
     /*LANG*/'Days': {
@@ -125,7 +121,6 @@ function editAlarm(alarmIndex, alarm) {
     /*LANG*/'Vibrate': require("buzz_menu").pattern(a.vibrate, v => a.vibrate=v ),
     /*LANG*/'Auto Snooze': {
       value: a.as,
-      format: v => v ? /*LANG*/"Yes" : /*LANG*/"No",
       onchange: v => a.as = v
     }
   };
@@ -179,7 +174,6 @@ function editTimer(alarmIndex, alarm) {
     },
     /*LANG*/'Enabled': {
       value: a.on,
-      format: v => v ? /*LANG*/"On" : /*LANG*/"Off",
       onchange: v => a.on = v
     },
     /*LANG*/'Vibrate': require("buzz_menu").pattern(a.vibrate, v => a.vibrate=v ),
diff --git a/apps/alarm/metadata.json b/apps/alarm/metadata.json
index 2084c2a30..33312beb6 100644
--- a/apps/alarm/metadata.json
+++ b/apps/alarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "alarm",
   "name": "Alarms & Timers",
   "shortName": "Alarms",
-  "version": "0.24",
+  "version": "0.25",
   "description": "Set alarms and timers on your Bangle",
   "icon": "app.png",
   "tags": "tool,alarm,widget",