diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin
index 1ae58eeb1d..48262f2c2a 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin
@@ -41,6 +41,7 @@
 		          class       = "ICSharpCode.FormsDesigner.Commands.AlignToGrid"/>
 		<MenuItem id = "AlignSeparator" type = "Separator"/>
 		<MenuItem id          = "ViewTabOrder"
+		          type        = "CheckBox"
 		          label       = "${res:XML.MainMenu.FormatMenu.ShowTabOrder}"
 		          class       = "ICSharpCode.FormsDesigner.Commands.ViewTabOrder"/>
 		<MenuItem id          = "Lock"
@@ -79,6 +80,7 @@
 		          class       = "ICSharpCode.FormsDesigner.Commands.ViewCode"/>
 		<MenuItem id = "ViewCodeSeparator" type = "Separator"/>
 		<MenuItem id          = "ViewTabOrder"
+		          type        = "CheckBox"
 		          label       = "${res:XML.MainMenu.FormatMenu.ShowTabOrder}"
 		          class       = "ICSharpCode.FormsDesigner.Commands.ViewTabOrder"/>
 		<MenuItem id          = "Lock"
@@ -274,6 +276,7 @@
 				</MenuItem>
 				<MenuItem id = "OrderSeparator" type = "Separator"/>
 				<MenuItem id          = "ViewTabOrder"
+				          type        = "CheckBox"
 				          label       = "${res:XML.MainMenu.FormatMenu.ShowTabOrder}"
 				          class       = "ICSharpCode.FormsDesigner.Commands.ViewTabOrder"/>
 				<MenuItem id          = "Lock"
diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/FormsCommands.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/FormsCommands.cs
index 2b877a5c08..11496eefad 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/FormsCommands.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/FormsCommands.cs
@@ -447,11 +447,6 @@ namespace ICSharpCode.FormsDesigner.Commands
 	{
 		public override bool IsChecked {
 			get {
-				IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
-				if (window == null) {
-					return false;
-				}
-				
 				FormsDesignerViewContent formDesigner = FormDesigner;
 				if (formDesigner != null) {
 					return formDesigner.IsTabOrderMode;
@@ -474,11 +469,6 @@ namespace ICSharpCode.FormsDesigner.Commands
 		
 		void SetTabOrder(bool show)
 		{
-			IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
-			if (window == null) {
-				return;
-			}
-			
 			FormsDesignerViewContent formDesigner = FormDesigner;
 			if (formDesigner != null) {
 				if (show) {
@@ -488,12 +478,6 @@ namespace ICSharpCode.FormsDesigner.Commands
 				}
 			}
 		}
-		
-		public override void Run()
-		{
-			 SetTabOrder(!IsChecked);
-		}
 	}
 #endregion
-
 }
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/Menu.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/Menu.cs
index 624d120def..3dc77ed2c1 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/Menu.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/Menu.cs
@@ -20,6 +20,7 @@ namespace ICSharpCode.Core
 		Codon  codon;
 		object caller;
 		ArrayList subItems;
+		bool isInitialized;
 		
 		public Menu(Codon codon, object caller, ArrayList subItems)
 		{
@@ -29,10 +30,6 @@ namespace ICSharpCode.Core
 			this.RightToLeft = RightToLeft.Inherit;
 			
 			UpdateText();
-			CreateDropDownItems(); // must be created to support shortcuts
-			if (DropDownItems.Count == 0 && subItems.Count > 0) {
-				DropDownItems.Add(new ToolStripMenuItem());
-			}
 		}
 		
 		public Menu(string text, params ToolStripItem[] subItems)
@@ -80,6 +77,13 @@ namespace ICSharpCode.Core
 			if (codon != null) {
 				ConditionFailedAction failedAction = codon.GetFailedAction(caller);
 				this.Visible = failedAction != ConditionFailedAction.Exclude;
+				if (!isInitialized && failedAction != ConditionFailedAction.Exclude) {
+					isInitialized = true;
+					CreateDropDownItems(); // must be created to support shortcuts
+					if (DropDownItems.Count == 0 && subItems.Count > 0) {
+						DropDownItems.Add(new ToolStripMenuItem());
+					}
+				}
 			}
 		}
 		
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/MenuCheckBox.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/MenuCheckBox.cs
index 0b481aee67..f78e209c54 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/MenuCheckBox.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/MenuCheckBox.cs
@@ -80,7 +80,9 @@ namespace ICSharpCode.Core
 			if (codon != null) {
 				ConditionFailedAction failedAction = codon.GetFailedAction(caller);
 				this.Visible = failedAction != ConditionFailedAction.Exclude;
-				Checked = MenuCommand.IsChecked;
+				if (MenuCommand != null) {
+					Checked = MenuCommand.IsChecked;
+				}
 			}
 		}