diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 1513194fe..9b88f0073 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -53,3 +53,4 @@
 0.47: Allow colors to be translated
       Improve "Turn Off" user experience
 0.48: Allow reading custom themes from files
+0.49: Now reloads settings properly after 'Calibrate Battery'
diff --git a/apps/setting/metadata.json b/apps/setting/metadata.json
index 17519730e..d209eafc3 100644
--- a/apps/setting/metadata.json
+++ b/apps/setting/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.48",
+  "version": "0.49",
   "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 3bb9b4e22..77e3fdd87 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -25,15 +25,7 @@ function updateOptions() {
   Bangle.setOptions(o)
 }
 
-function gToInternal(g) {
-  // converts g to Espruino internal unit
-  return g * 8192;
-}
 
-function internalToG(u) {
-  // converts Espruino internal unit to g
-  return u / 8192
-}
 
 function resetSettings() {
   settings = {
@@ -386,6 +378,11 @@ function showWhitelistMenu() {
 }
 
 function showLCDMenu() {
+  // converts g to Espruino internal unit
+  function gToInternal(g) { return g * 8192; }
+  // converts Espruino internal unit to g
+  function internalToG(u) { return u / 8192; }
+
   const lcdMenu = {
     '': { 'title': 'LCD' },
     '< Back': ()=>showSystemMenu(),
@@ -578,7 +575,7 @@ function showUtilMenu() {
           var s=require("Storage").readJSON("setting.json");
           s.batFullVoltage = (analogRead(D3)+analogRead(D3)+analogRead(D3)+analogRead(D3))/4;
           require("Storage").writeJSON("setting.json",s);
-          E.showAlert(/*LANG*/"Calibrated!").then(() => load("settings.app.js"));
+          E.showAlert(/*LANG*/"Calibrated!").then(() => load("setting.app.js"));
         } else {
           E.showAlert(/*LANG*/"Please charge Bangle.js for 3 hours and try again").then(() => load("settings.app.js"));
         }