diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino
index d373e58..e60d478 100644
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -4422,7 +4422,7 @@ void startFMDXScan() {
       band = BAND_FM;
       SelectBand();
     }
-    endMenu();
+    if (menu) endMenu();
     DoMemoryPosTune();
   } else {
     tunemode = TUNE_MAN;
@@ -4431,7 +4431,7 @@ void startFMDXScan() {
       SelectBand();
       endMenu();
     }
-    endMenu();
+    if (menu) endMenu();
     TuneUp();
     ShowFreq(0);
   }
diff --git a/src/rds.cpp b/src/rds.cpp
index 82946a9..c29fe86 100644
--- a/src/rds.cpp
+++ b/src/rds.cpp
@@ -452,7 +452,7 @@ void readRds() {
           dropout = false;
         }
       }
-      if (CurrentSkin == 1 && !advancedRDS) {
+      if (CurrentSkin == 1 && !advancedRDS && !afscreen && !screenmute) {
         if (hasrtplusold != radio.rds.hasRDSplus) {
           if (radio.rds.hasRDSplus) tft.pushImage (288, 151, 27, 16, skin1_rtpluson); else tft.pushImage (288, 151, 27, 16, skin1_rtplusoff);
           hasrtplusold = radio.rds.hasRDSplus;
@@ -469,7 +469,7 @@ void readRds() {
         }
 
         if (haseonold != radio.rds.hasEON) {
-          if (radio.rds.hasEON) tft.pushImage (254, 151, 30, 16, skin1_eonon); else tft.pushImage (254, 151, 30, 16, skin1_eonoff);
+          if (radio.eon_counter > 0) tft.pushImage (254, 151, 30, 16, skin1_eonon); else tft.pushImage (254, 151, 30, 16, skin1_eonoff);
           haseonold = radio.rds.hasEON;
         }