diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/MainWindow.cs b/CSharp/Libraries/UniversalEditor.UserInterface/MainWindow.cs
index 0c2b787c..8a8c6d6c 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/MainWindow.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/MainWindow.cs
@@ -165,7 +165,8 @@ namespace UniversalEditor.UserInterface
 					ribbonTabHome.Title = "Home";
 					this.Ribbon.Tabs.Add (ribbonTabHome);
 				}
-			} else {
+			}
+			if (this.CommandDisplayMode == CommandDisplayMode.CommandBar || this.CommandDisplayMode == CommandDisplayMode.Both) {
 				foreach (CommandBar cb in Engine.CurrentEngine.CommandBars) {
 					this.Controls.Add (LoadCommandBar(cb));
 				}