diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino
index 96f2894..215ec8b 100644
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -1031,23 +1031,13 @@ void loop() {
             break;
           }
         }
+        doLog();
         DoMemoryPosTune();
+        radio.clearRDS(fullsearchrds);
+        autologged = false;
         ShowMemoryPos();
       } else {
-        if (!autologged && RDSstatus && radio.rds.correctPI != 0) {
-          if (autolog) {
-            switch (addRowToCSV()) {
-              case 0: ShowFreq(2); break;
-              case 1: ShowFreq(3); break;
-              case 2: ShowFreq(4); break;
-            }
-
-            delay(200);
-            while (digitalRead(ROTARY_BUTTON) == LOW) delay(50);
-            ShowFreq(0);
-          }
-          autologged = true;
-        }
+        doLog();
         TuneUp();
         autologged = false;
         ShowFreq(0);
@@ -5514,3 +5504,19 @@ void toggleiMSEQ() {
     if (XDRGTKUSB || XDRGTKTCP) DataPrint("G" + String(!EQset) + String(!iMSset) + "\n");
   }
 }
+
+void doLog() {
+  if (!autologged && RDSstatus && radio.rds.correctPI != 0) {
+    if (autolog) {
+      switch (addRowToCSV()) {
+        case 0: ShowFreq(2); break;
+        case 1: ShowFreq(3); break;
+        case 2: ShowFreq(4); break;
+      }
+
+      delay(200);
+      ShowFreq(0);
+    }
+    autologged = true;
+  }
+}