diff --git a/devlib/utils/ssh.py b/devlib/utils/ssh.py
index 1faa16569..6c8df0166 100644
--- a/devlib/utils/ssh.py
+++ b/devlib/utils/ssh.py
@@ -72,9 +72,15 @@ def ssh_get_shell(host, username, password=None, keyfile=None, port=None, timeou
                 raise TargetError(message.format(host))
             time.sleep(5)
 
+    conn.sendline('shopt -s checkwinsize')
+    conn.prompt()
     conn.setwinsize(500,200)
     conn.sendline('')
     conn.prompt()
+    conn.sendline('stty rows 500')
+    conn.prompt()
+    conn.sendline('stty cols 200')
+    conn.prompt()
     conn.setecho(False)
     return conn