diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index a6b4f9cbe..d2d6047b4 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -2315,7 +2315,9 @@ void Screen::handleOnPress()
 {
     // If Canned Messages is using the "Scan and Select" input, dismiss the canned message frame when user button is pressed
     // Minimize impact as a courtesy, as "scan and select" may be used as default config for some boards
-    if (scanAndSelectInput != nullptr && scanAndSelectInput->dismissCannedMessageFrame())
+    // (Fall-through if using auto carousel, to prevent unexpected closing of canned message frame)
+    if (scanAndSelectInput != nullptr && !config.display.auto_screen_carousel_secs &&
+        scanAndSelectInput->dismissCannedMessageFrame())
         return;
 
     // Don't transition away from canned messages if it is active