diff --git a/apps/clkinfostopw/settings.js b/apps/clkinfostopw/settings.js
index 89b234f3b..df51cd705 100644
--- a/apps/clkinfostopw/settings.js
+++ b/apps/clkinfostopw/settings.js
@@ -13,9 +13,11 @@
         "< Back": back,
         "Format": {
             value: settings.format,
-            format: function () { return settings.format == 0 ? "12h34m56s" : "12:34:56"; },
-            onchange: function () {
-                settings.format = (settings.format + 1) % 2;
+            min: 0,
+            max: 1,
+            format: function (v) { return v === 0 ? "12m34s" : "12:34"; },
+            onchange: function (v) {
+                settings.format = v;
                 save();
             },
         },
diff --git a/apps/clkinfostopw/settings.ts b/apps/clkinfostopw/settings.ts
index 352c02677..3d7ff5c05 100644
--- a/apps/clkinfostopw/settings.ts
+++ b/apps/clkinfostopw/settings.ts
@@ -22,9 +22,11 @@ type StopWatchSettings = {
     "< Back": back,
     "Format": {
       value: settings.format,
-      format: () => settings.format == StopWatchFormat.HMS ? "12h34m56s" : "12:34:56",
-      onchange: () => {
-        settings.format = (settings.format + 1) % 2;
+      min: StopWatchFormat.HMS,
+      max: StopWatchFormat.Colon,
+      format: v => v === StopWatchFormat.HMS ? "12m34s" : "12:34",
+      onchange: v => {
+        settings.format = v;
         save();
       },
     },