diff --git a/src/displayapp/screens/CheckboxList.cpp b/src/displayapp/screens/CheckboxList.cpp
index d351a852..7c7e8565 100644
--- a/src/displayapp/screens/CheckboxList.cpp
+++ b/src/displayapp/screens/CheckboxList.cpp
@@ -89,7 +89,7 @@ CheckboxList::CheckboxList(const uint8_t screenID,
       lv_obj_set_event_cb(cbOption[i], event_handler);
       SetRadioButtonStyle(cbOption[i]);
 
-      if (static_cast<unsigned int>((settingsController.*GetOptionIndex)() - MAXLISTITEMS * screenID) == i) {
+      if (static_cast<unsigned int>((settingsController.*GetOptionIndex)() - MaxItems * screenID) == i) {
         lv_checkbox_set_checked(cbOption[i], true);
       }
     }
@@ -107,7 +107,7 @@ void CheckboxList::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       if (strcmp(options[i], "")) {
         if (object == cbOption[i]) {
           lv_checkbox_set_checked(cbOption[i], true);
-          (settingsController.*SetOptionIndex)(MAXLISTITEMS * screenID + i);
+          (settingsController.*SetOptionIndex)(MaxItems* screenID + i);
         } else {
           lv_checkbox_set_checked(cbOption[i], false);
         }
diff --git a/src/displayapp/screens/CheckboxList.h b/src/displayapp/screens/CheckboxList.h
index 68280edd..5bdd143e 100644
--- a/src/displayapp/screens/CheckboxList.h
+++ b/src/displayapp/screens/CheckboxList.h
@@ -3,12 +3,11 @@
 #include <lvgl/lvgl.h>
 #include <cstdint>
 #include <memory>
+#include <array>
 #include "displayapp/screens/Screen.h"
 #include "displayapp/Apps.h"
 #include "components/settings/Settings.h"
 
-#define MAXLISTITEMS 4
-
 namespace Pinetime {
   namespace Applications {
     namespace Screens {