diff --git a/locales/en/messages.json b/locales/en/messages.json
index 3614ec4e..70fb277f 100644
--- a/locales/en/messages.json
+++ b/locales/en/messages.json
@@ -2259,6 +2259,9 @@
     "cliCopyToClipboardBtn": {
         "message": "Copy to clipboard"
     },
+    "cliCopySuccessful": {
+        "message": "Content has been copied to clipboard!"
+    },
 
     "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 d618fcc5..a865d137 100644
--- a/src/js/tabs/cli.js
+++ b/src/js/tabs/cli.js
@@ -41,6 +41,35 @@ function getCliCommand(command, cliBuffer) {
     return commandWithBackSpaces(command, buffer, noOfCharsToDelete);
 }
 
+function copyToClipboard(text) {
+    function onCopySuccessful() {
+        writeLineToOutput("* " + i18n.getMessage("cliCopySuccessful"));
+    }
+
+    function onCopyFailed(ex) {
+        console.warn(ex);
+    }
+
+    function nwCopy(text) {
+        try {
+            let gui = require('nw.gui'),
+                clipboard = gui.Clipboard.get();
+            clipboard.set(text, "text");
+            onCopySuccessful();
+        } catch (ex) {
+            onCopyFailed(ex);
+        }
+    }
+
+    function webCopy(text) {
+        navigator.clipboard.writeText(text)
+            .then(onCopySuccessful, onCopyFailed);
+    }
+
+    let copyFunc = !navigator.clipboard ? nwCopy : webCopy;
+    copyFunc(text);
+}
+
 TABS.cli.initialize = function (callback) {
     var self = this;
 
@@ -108,13 +137,7 @@ TABS.cli.initialize = function (callback) {
         });
 
         $('.tab-cli .copy').click(function() {
-            try {
-                let gui = require('nw.gui'),
-                    clipboard = gui.Clipboard.get();
-                clipboard.set(self.outputHistory, "text");
-            } catch (ex) {
-                console.warn(ex);
-            }
+            copyToClipboard(self.outputHistory);
         });
 
         // Tab key detection must be on keydown,