diff --git a/apps/bthrm/boot.js b/apps/bthrm/boot.js
index 06ead0965..5e348672d 100644
--- a/apps/bthrm/boot.js
+++ b/apps/bthrm/boot.js
@@ -2,6 +2,9 @@
   var log = function() {};//print
   var gatt;
 
+  Bangle.isHRMOn = function() {
+    return gatt!==undefined;
+  }
   Bangle.setHRMPower = function(isOn, app) {
     // Do app power handling
     if (!app) app="?";
diff --git a/apps/heart/app.js b/apps/heart/app.js
index ed249c343..5428ea06b 100644
--- a/apps/heart/app.js
+++ b/apps/heart/app.js
@@ -303,7 +303,7 @@ function graphRecord(n) {
   log("Finished rendering data");
   Bangle.buzz(200, 0.3);
   g.flip();
-  setWatch(stop, BTN2, {edge:"falling", debounce:50, repeat:false});
+  setWatch(stop, (global.BTN2!==undefined)?BTN2:BTN1, {edge:"falling", debounce:50, repeat:false});
   return;
 }
 
diff --git a/apps/widhrm/widget.js b/apps/widhrm/widget.js
index f3b3ff45e..7ffe1aa6d 100644
--- a/apps/widhrm/widget.js
+++ b/apps/widhrm/widget.js
@@ -2,6 +2,7 @@
   if (!Bangle.isLocked) return; // old firmware
   var currentBPM;
   var lastBPM;
+  var isHRMOn = false;
 
   // turn on sensor when the LCD is unlocked
   Bangle.on('lock', function(isLocked) {
@@ -14,19 +15,24 @@
     }
   });
 
+  var hp = Bangle.setHRMPower;
+  Bangle.setHRMPower = () => {
+    hp.apply(Bangle, arguments);
+    isHRMOn = Bangle.isHRMOn();
+    WIDGETS["hrm"].draw();
+  };
+
   Bangle.on('HRM',function(d) {
     currentBPM = d.bpm;
     lastBPM = currentBPM;
     WIDGETS["hrm"].draw();
   });
-  Bangle.setHRMPower(!Bangle.isLocked(),"widhrm");
 
   // add your widget
   WIDGETS["hrm"]={area:"tl",width:24,draw:function() {
     var width = 24;
     g.reset();
-    g.setFont("6x8", 1);
-    g.setFontAlign(0, 0);
+    g.setFont("6x8", 1).setFontAlign(0, 0);
     g.clearRect(this.x,this.y+15,this.x+width,this.y+23); // erase background
     var bpm = currentBPM, isCurrent = true;
     if (bpm===undefined) {
@@ -37,8 +43,10 @@
       bpm = "--";
     g.setColor(isCurrent ? g.theme.fg : "#808080");
     g.drawString(bpm, this.x+width/2, this.y+19);
-    g.setColor(isCurrent ? "#ff0033" : "#808080");
+    g.setColor(isHRMOn ? "#ff0033" : "#808080");
     g.drawImage(atob("CgoCAAABpaQ//9v//r//5//9L//A/+AC+AAFAA=="),this.x+(width-10)/2,this.y+1);
     g.setColor(-1);
   }};
+
+  Bangle.setHRMPower(!Bangle.isLocked(),"widhrm");
 })();