diff --git a/spring-shell2-core/src/main/java/org/springframework/shell2/Shell.java b/spring-shell2-core/src/main/java/org/springframework/shell2/Shell.java
index 3230e1b5..a4c24876 100644
--- a/spring-shell2-core/src/main/java/org/springframework/shell2/Shell.java
+++ b/spring-shell2-core/src/main/java/org/springframework/shell2/Shell.java
@@ -102,7 +102,7 @@ public class Shell implements CommandRegistry {
 			}
 
 
-			String line = input.rawText();
+			String line = input.words().stream().collect(Collectors.joining(" ")).trim();
 			List<String> words = input.words();
 
 			String command = findLongestCommand(line);