diff --git a/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs b/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
index 6f9484cb33..dade19d948 100644
--- a/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
+++ b/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
@@ -1664,8 +1664,9 @@ namespace ICSharpCode.NRefactory.CSharp
 		public override void VisitAnonymousMethodExpression(AnonymousMethodExpression anonymousMethodExpression)
 		{
 			if (!anonymousMethodExpression.Body.IsNull) {
-				if (anonymousMethodExpression.Body.LBraceToken.StartLocation.Line != anonymousMethodExpression.Body.RBraceToken.StartLocation.Line)
+				if (anonymousMethodExpression.Body.LBraceToken.GetNextNode () != anonymousMethodExpression.Body.RBraceToken) {
 					EnforceBraceStyle(policy.AnonymousMethodBraceStyle, anonymousMethodExpression.Body.LBraceToken, anonymousMethodExpression.Body.RBraceToken);
+				}
 				VisitBlockWithoutFixingBraces(anonymousMethodExpression.Body, policy.IndentBlocks);
 				return;
 			}
diff --git a/ICSharpCode.NRefactory.Tests/FormattingTests/TestBraceStlye.cs b/ICSharpCode.NRefactory.Tests/FormattingTests/TestBraceStlye.cs
index 2b6178262c..59ae20e07d 100644
--- a/ICSharpCode.NRefactory.Tests/FormattingTests/TestBraceStlye.cs
+++ b/ICSharpCode.NRefactory.Tests/FormattingTests/TestBraceStlye.cs
@@ -76,7 +76,7 @@ namespace B {
 {
 	void Foo ()
 	{
-		EventHandler handler = delegate(object sender, EventArgs e){};
+		EventHandler handler = delegate(object sender, EventArgs e){foo ();};
 	}
 }",
 @"class Test
@@ -84,6 +84,7 @@ namespace B {
 	void Foo ()
 	{
 		EventHandler handler = delegate(object sender, EventArgs e) {
+			foo ();
 		};
 	}
 }");