diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa848ce..3d1a6ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,8 @@ target_sources(infinisim PUBLIC
   ${InfiniTime_DIR}/src/displayapp/DisplayApp.cpp
   ${InfiniTime_DIR}/src/buttonhandler/ButtonHandler.h
   ${InfiniTime_DIR}/src/buttonhandler/ButtonHandler.cpp
+  ${InfiniTime_DIR}/src/components/stopwatch/StopWatchController.h
+  ${InfiniTime_DIR}/src/components/stopwatch/StopWatchController.cpp
   ${InfiniTime_DIR}/src/components/alarm/AlarmController.h
   ${InfiniTime_DIR}/src/components/alarm/AlarmController.cpp
   ${InfiniTime_DIR}/src/components/ble/BleController.h
diff --git a/main.cpp b/main.cpp
index 4b7bbda..f807107 100644
--- a/main.cpp
+++ b/main.cpp
@@ -362,6 +362,7 @@ Pinetime::Controllers::MotionController motionController;
 Pinetime::Controllers::TimerController timerController;
 #endif
 
+Pinetime::Controllers::StopWatchController stopWatchController {};
 #if defined(ALARMCONTROLLER_NEEDS_FS)
 Pinetime::Controllers::AlarmController alarmController {dateTimeController, fs};
 #else
@@ -385,6 +386,7 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
                                               #if defined(INFINITIME_TIMERCONTROLLER)
                                               timerController,
                                               #endif
+                                              stopWatchController,
                                               alarmController,
                                               brightnessController,
                                               touchHandler,
@@ -401,6 +403,7 @@ Pinetime::System::SystemTask systemTask(spi,
                                         #if defined(INFINITIME_TIMERCONTROLLER)
                                         timerController,
                                         #endif
+                                        stopWatchController,
                                         alarmController,
                                         watchdog,
                                         notificationManager,