diff --git a/apps/bwclk/ChangeLog b/apps/bwclk/ChangeLog
index 75f973f52..11569af0c 100644
--- a/apps/bwclk/ChangeLog
+++ b/apps/bwclk/ChangeLog
@@ -3,4 +3,4 @@
 0.03: Adapt colors based on the theme of the user.
 0.04: Steps can be hidden now such that the time is even larger.
 0.05: Included icons for information.
-0.06: Design improvements.
\ No newline at end of file
+0.06: Design and usability improvements.
\ No newline at end of file
diff --git a/apps/bwclk/app.js b/apps/bwclk/app.js
index 97f3a14af..20edddf7e 100644
--- a/apps/bwclk/app.js
+++ b/apps/bwclk/app.js
@@ -403,7 +403,6 @@ Bangle.on('touch', function(btn, e){
   if(is_right){
     Bangle.buzz(40, 0.6);
     settings.showInfo = (settings.showInfo+1) % maxInfo;
-    storage.write(SETTINGS_FILE, settings);
     draw();
   }
 
@@ -411,11 +410,15 @@ Bangle.on('touch', function(btn, e){
     Bangle.buzz(40, 0.6);
     settings.showInfo = settings.showInfo-1;
     settings.showInfo = settings.showInfo < 0 ? maxInfo-1 : settings.showInfo;
-    storage.write(SETTINGS_FILE, settings);
     draw();
   }
 });
 
 
+E.on("kill", function(){
+  storage.write(SETTINGS_FILE, settings);
+});
+
+
 // Show launcher when middle button pressed
 Bangle.setUI("clock");