diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs b/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs
index 9f418f79df..ba3f1381d8 100644
--- a/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs
+++ b/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs
@@ -391,8 +391,7 @@ namespace ICSharpCode.NRefactory.Parser.CSharp
 					originalValue.Append("\"\"");
 					sb.Append('"');
 					ReaderRead();
-				}
-				if (HandleLineEnd(ch)) {
+				} else if (HandleLineEnd(ch)) {
 					sb.Append("\r\n");
 					originalValue.Append("\r\n");
 				} else {
diff --git a/src/Libraries/NRefactory/Test/Lexer/CSharp/NumberLexerTest.cs b/src/Libraries/NRefactory/Test/Lexer/CSharp/NumberLexerTest.cs
index 2790514dfc..6a3abc073e 100644
--- a/src/Libraries/NRefactory/Test/Lexer/CSharp/NumberLexerTest.cs
+++ b/src/Libraries/NRefactory/Test/Lexer/CSharp/NumberLexerTest.cs
@@ -114,5 +114,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.CSharp
 			CheckToken("1.1e-2m", 1.1e-2m);
 			CheckToken("2.0e-5m", 2.0e-5m);
 		}
+		
+		[Test]
+		public void TestString()
+		{
+			CheckToken(@"@""-->""""<--""", @"-->""<--");
+			CheckToken(@"""-->\""<--""", "-->\"<--");
+		}
 	}
 }