diff --git a/locales/en/messages.json b/locales/en/messages.json
index 5a1fb045..e5ea8382 100644
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -2093,6 +2093,9 @@
     "cliSaveToFileBtn": {
         "message": "Save to File"
     },
+    "cliClearOutputHistoryBtn": {
+        "message": "Clear output history"
+    },
 
     "loggingNote": {
         "message": "Data will be logged in this tab <span class=\"message-negative\">only</span>, leaving the tab will <span class=\"message-negative\">cancel</span> logging and application will return to its normal <strong>\"configurator\"</strong> state.<br /> You are free to select the global update period, data will be written into the log file every <strong>1</strong> second for performance reasons."
diff --git a/src/js/tabs/cli.js b/src/js/tabs/cli.js
index 4fbb55a9..76b04fad 100644
--- a/src/js/tabs/cli.js
+++ b/src/js/tabs/cli.js
@@ -102,6 +102,11 @@ TABS.cli.initialize = function (callback) {
             });
         });
 
+        $('.tab-cli .clear').click(function() {
+            self.outputHistory = "";
+            $('.tab-cli .window .wrapper').empty();
+        });
+
         // Tab key detection must be on keydown,
         // `keypress`/`keyup` happens too late, as `textarea` will have already lost focus.
         textarea.keydown(function (event) {
diff --git a/src/tabs/cli.html b/src/tabs/cli.html
index 21f01e75..2ba6514f 100644
--- a/src/tabs/cli.html
+++ b/src/tabs/cli.html
@@ -16,6 +16,7 @@
     <div class="content_toolbar">
         <div class="btn save_btn pull-right">
             <a class="save" href="#" i18n="cliSaveToFileBtn"></a>
+            <a class="clear" href="#" i18n="cliClearOutputHistoryBtn"></a>
         </div>
     </div>
 </div>