diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp
index 39138b632..84d657dff 100644
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -599,10 +599,14 @@ bool CannedMessageModule::handleMessageSelectorInput(const InputEvent *event, bo
             NodeNum destNode = dest;
             ChannelIndex chan = channel;
 #if CANNED_MESSAGE_ADD_CONFIRMATION
-            graphics::menuHandler::showConfirmationBanner(
-                "Send message?", [this, destNode, chan, current]() { this->sendText(destNode, chan, current, false); });
+            graphics::menuHandler::showConfirmationBanner("Send message?", [this, destNode, chan, current]() {
+                // this->sendText(destNode, chan, current, false);
+                payload = runState;
+                runState = CANNED_MESSAGE_RUN_STATE_ACTION_SELECT;
+            });
 #else
-            this->sendText(destNode, chan, current, false);
+            payload = runState;
+            runState = CANNED_MESSAGE_RUN_STATE_ACTION_SELECT;
 #endif
             // Do not immediately set runState; wait for confirmation
             handled = true;
@@ -1719,7 +1723,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
                     // Text: split by words and wrap inside word if needed
                     String text = token.second;
                     pos = 0;
-                    while (pos < text.length()) {
+                    while (pos < static_cast<int>(text.length())) {
                         // Find next space (or end)
                         int spacePos = text.indexOf(' ', pos);
                         int endPos = (spacePos == -1) ? text.length() : spacePos + 1; // Include space