diff --git a/src/octoprint/static/gcodeviewer/js/gCodeReader.js b/src/octoprint/static/gcodeviewer/js/gCodeReader.js
index 5dc18981..abc56727 100644
--- a/src/octoprint/static/gcodeviewer/js/gCodeReader.js
+++ b/src/octoprint/static/gcodeviewer/js/gCodeReader.js
@@ -146,7 +146,7 @@ GCODE.gCodeReader = (function(){
             this.clear();
 
             var totalSize = reader.target.result.length;
-            lines = reader.target.result.split(/\n/);
+            lines = reader.target.result.split(/[\r\n]+/g);
             reader.target.result = null;
             prepareGCode(totalSize);