diff --git a/tabs/cli.css b/tabs/cli.css
index 5f15e02311..093e9ee4af 100644
--- a/tabs/cli.css
+++ b/tabs/cli.css
@@ -29,7 +29,7 @@
 
         margin-top: 8px;
 
-        height: 20px;
+        height: 22px;
         line-height: 20px;
 
         padding-left: 5px;
diff --git a/tabs/cli.html b/tabs/cli.html
index 1c6aa5edc7..3c9c585ed8 100644
--- a/tabs/cli.html
+++ b/tabs/cli.html
@@ -5,5 +5,5 @@
         <div class="wrapper">
         </div>
     </div>
-    <textarea name="commands" i18n_placeholder="cliInputPlaceholder" rows="0" cols="0"></textarea>
+    <textarea name="commands" i18n_placeholder="cliInputPlaceholder" rows="1" cols="0"></textarea>
 </div>
\ No newline at end of file
diff --git a/tabs/cli.js b/tabs/cli.js
index 8ba21c89f7..a58a1c80c7 100644
--- a/tabs/cli.js
+++ b/tabs/cli.js
@@ -43,18 +43,21 @@ function tab_initialize_cli() {
         serial.send(bufferOut, function(writeInfo) {});
 
         var textarea = $('.tab-cli textarea');
+
         textarea.keypress(function(event) {
             if (event.which == 13) { // enter
-                var out_string = $('.tab-cli textarea').val();
+                event.preventDefault(); // prevent the adding of new line
+
+                var out_string = textarea.val();
                 var out_arr = out_string.split("\n");
                 cli_history.add(out_string.trim());
-                var timeout_needle = 0;
 
+                var timeout_needle = 0;
                 for (var i = 0; i < out_arr.length; i++) {
                     send_slowly(out_arr, i, timeout_needle++);
                 }
 
-                $('.tab-cli textarea').val('');
+                textarea.val('');
             }
         });
 
@@ -69,7 +72,7 @@ function tab_initialize_cli() {
         });
 
         // give input element user focus
-        $('.tab-cli textarea').focus();
+        textarea.focus();
     });
 }