diff --git a/lib/ace/mode/behaviour/cstyle.js b/lib/ace/mode/behaviour/cstyle.js
index 8397e79c..346b5867 100644
--- a/lib/ace/mode/behaviour/cstyle.js
+++ b/lib/ace/mode/behaviour/cstyle.js
@@ -116,7 +116,7 @@ var CstyleBehaviour = function () {
                     };
                 }
             }
-        } else if (text == "\n") {
+        } else if (text == "\n" || text == "\r\n") {
             var cursor = editor.getCursorPosition();
             var line = session.doc.getLine(cursor.row);
             var rightChar = line.substring(cursor.column, cursor.column + 1);