diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 7eaa9c207..d7d62d0b0 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -830,6 +830,9 @@ int CmdTraceList(const char *Cmd) {
         ClearAuthData();
         while (tracepos < traceLen) {
             tracepos = printTraceLine(tracepos, traceLen, trace, protocol, showWaitCycles, markCRCBytes);
+            
+            if (kbd_enter_pressed())
+                break;
         }
     }
     return 0;