diff --git a/src/keyboard_utils.cpp b/src/keyboard_utils.cpp
index 277cb26..a5844f9 100644
--- a/src/keyboard_utils.cpp
+++ b/src/keyboard_utils.cpp
@@ -205,12 +205,11 @@ namespace KEYBOARD_Utils {
       MSG_Utils::loadNumMessages();
       menuDisplay = 12;
     } else if (menuDisplay == 130) {
-      menuDisplay = 1300;
-    } else if (menuDisplay == 1300) {
-      if (!keyDetected) {
+      if (keyDetected) {
+        menuDisplay = 1300;
+      } else {
         show_display(" APRS Thu.", "Sending:", "Happy #APRSThursday", "from LoRa Tracker 73!", 2000);
         MSG_Utils::sendMessage("ANSRVR","CQ HOTG Happy #APRSThursday from LoRa Tracker 73!");
-        menuDisplay = 130;
       }
     } else if (menuDisplay == 131) {
       show_display(" APRS Thu.", "", "     Unsubscribe", " from APRS Thursday", 2000);
diff --git a/src/menu_utils.cpp b/src/menu_utils.cpp
index 3abdc2d..6b26116 100644
--- a/src/menu_utils.cpp
+++ b/src/menu_utils.cpp
@@ -140,22 +140,16 @@ namespace MENU_Utils {
                 show_display(" APRS Thu.", "> Join APRSThursday", "  Unsubscribe", "  KeepSubscribed+12h", "", lastLine);
                 break;
             case 1300:
-                if (keyDetected) {
-                    if (messageText.length() <= 67) {
-                        if (messageText.length() < 10) {
-                            show_display("WRITE_MSG>", "  - APRSThursday -", "MSG -> " + messageText, "", "", "<Back   (0" + String(messageText.length()) + ")   Enter>");
-                        } else {
-                            show_display("WRITE_MSG>", "  - APRSThursday -", "MSG -> " + messageText, "", "", "<Back   (" + String(messageText.length()) + ")   Enter>");
-                        }     
+                if (messageText.length() <= 67) {
+                    if (messageText.length() < 10) {
+                        show_display("WRITE_MSG>", "  - APRSThursday -", "MSG -> " + messageText, "", "", "<Back   (0" + String(messageText.length()) + ")   Enter>");
                     } else {
-                        show_display("WRITE_MSG>", "---  MSG TO LONG! ---", " -> " + messageText, "", "", "<Back   (" + String(messageText.length()) + ")");
-                    }
+                        show_display("WRITE_MSG>", "  - APRSThursday -", "MSG -> " + messageText, "", "", "<Back   (" + String(messageText.length()) + ")   Enter>");
+                    }     
                 } else {
-                    show_display("WRITE_MSG>", "  - APRSThursday -", "No Keyboard Detected", " Long Push --> send:", " '#APRSThursday 73'", "1P = Back");           
-                }     
+                    show_display("WRITE_MSG>", "---  MSG TO LONG! ---", " -> " + messageText, "", "", "<Back   (" + String(messageText.length()) + ")");
+                }
                 break;
-
-
             case 131:   // 1.Messages ---> APRSThursday ---> Delete: ALL
                 show_display("APRS Thu._", "  Join APRSThursday", "> Unsubscribe", "  KeepSubscribed+12h", "", lastLine);
                 break;