diff --git a/platformio.ini b/platformio.ini
index 37e8e7b..e1bc632 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -34,7 +34,7 @@ build_flags = ${furble.build_flags} -DFURBLE_M5STICKC_PLUS
 
 [env:m5stack-core]
 board = m5stack-core-esp32
-build_flags = ${furble.build_flags} -DFURBLE_GROVE_CORE -DFURBLE_M5COREX
+build_flags = ${furble.build_flags} -DFURBLE_GROVE_CORE -DFURBLE_M5COREX -DFURBLE_M5STACK_CORE
 
 [env:m5stack-core2]
 board = m5stack-core2
diff --git a/src/FurbleUI.cpp b/src/FurbleUI.cpp
index 84e7a10..f47107b 100644
--- a/src/FurbleUI.cpp
+++ b/src/FurbleUI.cpp
@@ -790,7 +790,14 @@ void UI::addMainMenu(void) {
 
   m_PowerOff = addMenuItem(m_MainMenu, LV_SYMBOL_POWER, "Power Off");
   lv_obj_add_event_cb(
-      m_PowerOff, [](lv_event_t *e) { M5.Power.powerOff(); }, LV_EVENT_CLICKED, NULL);
+      m_PowerOff,
+      [](lv_event_t *e) {
+#if defined(FURBLE_M5STACK_CORE)
+        esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_TIMER);
+#endif
+        M5.Power.powerOff();
+      },
+      LV_EVENT_CLICKED, NULL);
 
   lv_obj_add_event_cb(
       m_MainMenu.main,