diff --git a/client/src/main/java/org/apache/karaf/client/Main.java b/client/src/main/java/org/apache/karaf/client/Main.java
index 5fe8574..3689ff1 100644
--- a/client/src/main/java/org/apache/karaf/client/Main.java
+++ b/client/src/main/java/org/apache/karaf/client/Main.java
@@ -173,6 +173,7 @@ public class Main {
                 ConsoleInputStream in = new ConsoleInputStream(terminal.wrapInIfNeeded(System.in));
                 new Thread(in).start();
                 channel.setIn(in);
+                ((ChannelShell) channel).setPtyColumns(terminal != null ? terminal.getWidth() : 80);
                 ((ChannelShell) channel).setupSensibleDefaultPty();
                 ((ChannelShell) channel).setAgentForwarding(true);
                 String ctype = System.getenv("LC_CTYPE");