diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino
index cd8e522..99022f7 100644
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -1376,6 +1376,7 @@ void loop() {
   }
 
   if (digitalRead(EXT_IRQ) == LOW) {
+    if (screensavertriggered) WakeToSleep(REVERSE);
     int num;
     num = GetNum();
     if (num != -1)
@@ -4846,10 +4847,11 @@ void endMenu() {
   PSSprite.setTextDatum(TL_DATUM);
   BuildDisplay();
   SelectBand();
-  ScreensaverTimerRestart();
 }
 
 void startFMDXScan() {
+  ScreensaverTimerSet(screensaverOptions[screensaverset]);
+  if (screensaverset) ScreensaverTimerRestart();
   initdxscan = true;
   scanholdflag = false;
   autologged = false;