diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveBracesAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveBracesAction.cs
index 21e82fa430..3d7a6fc529 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveBracesAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/RemoveBracesAction.cs
@@ -41,6 +41,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			}
 
 			yield return new CodeAction (context.TranslateString("Remove braces"), script => {
+				var start = script.GetCurrentOffset (block.LBraceToken.GetPrevNode ().EndLocation);
+				var end = script.GetCurrentOffset (block.LBraceToken.EndLocation);
+				if (end <= start)
+					return;
+				script.RemoveText (start, end - start);
 				script.Remove(block.LBraceToken);
 				script.Remove(block.RBraceToken);
 				script.FormatText(block.Parent);
diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveBracesTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveBracesTests.cs
index 7fe879c053..3f1765a125 100644
--- a/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveBracesTests.cs
+++ b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/RemoveBracesTests.cs
@@ -53,7 +53,7 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
 				"{" + Environment.NewLine +
 				"	void Test ()" + Environment.NewLine +
 				"	{" + Environment.NewLine +
-				"		if (true) " + Environment.NewLine +
+				"		if (true)" + Environment.NewLine +
 				"			;" + Environment.NewLine +
 				"	}" + Environment.NewLine +
 				"}", result);