diff --git a/lib/device-ui b/lib/device-ui
index 5aa10bd54..ca5a3e359 160000
--- a/lib/device-ui
+++ b/lib/device-ui
@@ -1 +1 @@
-Subproject commit 5aa10bd54abd7fe0a63570e4672c3c8d7d39a49b
+Subproject commit ca5a3e359f572f326f9a8cfdcd2da2aa9de4e3f3
diff --git a/src/sleep.cpp b/src/sleep.cpp
index c9c45bf67..037912787 100644
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -369,6 +369,9 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
     gpio_wakeup_enable(pin, GPIO_INTR_LOW_LEVEL);
     esp_sleep_enable_gpio_wakeup();
 #endif
+#ifdef INPUTDRIVER_ENCODER_BTN
+    gpio_wakeup_enable((gpio_num_t)INPUTDRIVER_ENCODER_BTN, GPIO_INTR_LOW_LEVEL);
+#endif
 #ifdef T_WATCH_S3
     gpio_wakeup_enable((gpio_num_t)SCREEN_TOUCH_INT, GPIO_INTR_LOW_LEVEL);
 #endif
diff --git a/variants/t-deck/variant.h b/variants/t-deck/variant.h
index ddd1fb402..c3c4d0527 100644
--- a/variants/t-deck/variant.h
+++ b/variants/t-deck/variant.h
@@ -27,8 +27,10 @@
 
 #define SLEEP_TIME 120
 
+#ifndef HAS_TFT
 #define BUTTON_PIN 0
 // #define BUTTON_NEED_PULLUP
+#endif
 
 #define GPS_RX_PIN 44
 #define GPS_TX_PIN 43
@@ -60,7 +62,7 @@
 #define TB_DOWN 15
 #define TB_LEFT 1
 #define TB_RIGHT 2
-#define TB_PRESS BUTTON_PIN
+#define TB_PRESS 0 // BUTTON_PIN
 
 // microphone
 #define ES7210_SCK 47