diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fd8ece62..0590be76 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -403,6 +403,9 @@ list(APPEND SOURCE_FILES
         displayapp/widgets/DotIndicator.cpp
         displayapp/widgets/StatusIcons.cpp
 
+        ## Added
+        displayapp/screens/calculator.cpp
+
         ## Settings
         displayapp/screens/settings/QuickSettings.cpp
         displayapp/screens/settings/Settings.cpp
diff --git a/src/displayapp/apps/Apps.h.in b/src/displayapp/apps/Apps.h.in
index 2104a267..38e20e5d 100644
--- a/src/displayapp/apps/Apps.h.in
+++ b/src/displayapp/apps/Apps.h.in
@@ -42,7 +42,10 @@ namespace Pinetime {
       SettingChimes,
       SettingShakeThreshold,
       SettingBluetooth,
-      Error
+      Error,
+
+      ## Added
+      Calculator
     };
 
     enum class WatchFace : uint8_t {