diff --git a/app/src/cc/arduino/ConsoleOutputStream.java b/app/src/cc/arduino/ConsoleOutputStream.java
index a1c1e959c..b44603984 100644
--- a/app/src/cc/arduino/ConsoleOutputStream.java
+++ b/app/src/cc/arduino/ConsoleOutputStream.java
@@ -116,8 +116,9 @@ public class ConsoleOutputStream extends ByteArrayOutputStream {
     if (document != null) {
       SwingUtilities.invokeLater(() -> {
         try {
+          String lineWithoutSlashR = line.replace("\r\n", "\n").replace("\r", "\n");
           int offset = document.getLength();
-          document.insertString(offset, line, attributes);
+          document.insertString(offset, lineWithoutSlashR, attributes);
         } catch (BadLocationException ble) {
           //ignore
         }