diff --git a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
index 72d289ef07..581d0864c7 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
@@ -398,6 +398,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			if (e.Key == "WordWrap") {
 				SetWordWrap();
+				ToolBarService.UpdateStatus(toolStrip.Items);
 			}
 			if (e.Key == "DefaultFont") {
 				var font = FontSelectionPanel.ParseFont(properties.Get("DefaultFont", Core.WinForms.WinFormsResourceService.DefaultMonospacedFont.ToString()).ToString());
diff --git a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageViewToolbarCommands.cs b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageViewToolbarCommands.cs
index 1af891f56e..6a59db1e68 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageViewToolbarCommands.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageViewToolbarCommands.cs
@@ -71,7 +71,6 @@ namespace ICSharpCode.SharpDevelop.Gui
 	
 	public class ToggleMessageViewWordWrap : AbstractCheckableMenuCommand
 	{
-
 		public override bool IsChecked {
 			get {
 				return CompilerMessageView.Instance.WordWrap;