diff --git a/Libraries/UniversalEditor.UserInterface/Editor.cs b/Libraries/UniversalEditor.UserInterface/Editor.cs
index 2240de87..a8b031e3 100644
--- a/Libraries/UniversalEditor.UserInterface/Editor.cs
+++ b/Libraries/UniversalEditor.UserInterface/Editor.cs
@@ -146,6 +146,8 @@ namespace UniversalEditor.UserInterface
 				if (e.Cancel) return;
 				_CurrentView = e.NewView;
 				OnViewChanged(new EditorViewChangedEventArgs(e.OldView, e.NewView));
+
+				(Parent as Pages.EditorPage).UpdateViewButton(_CurrentView);
 			}
 		}
 
diff --git a/Libraries/UniversalEditor.UserInterface/EditorReference.cs b/Libraries/UniversalEditor.UserInterface/EditorReference.cs
index fe9b2f1b..533a19df 100644
--- a/Libraries/UniversalEditor.UserInterface/EditorReference.cs
+++ b/Libraries/UniversalEditor.UserInterface/EditorReference.cs
@@ -33,7 +33,10 @@ namespace UniversalEditor.UserInterface
 		public CommandBar.CommandBarCollection CommandBars { get; } = new CommandBar.CommandBarCollection();
 		public Command.CommandCollection Commands { get; } = new Command.CommandCollection();
 		public PanelReference.PanelReferenceCollection Panels { get; } = new PanelReference.PanelReferenceCollection();
+
+		public EditorView DefaultView { get; set; } = null;
 		public EditorView.EditorViewCollection Views { get; } = new EditorView.EditorViewCollection();
+
 		public Variable.VariableCollection Variables { get; } = new Variable.VariableCollection();
 		public Toolbox Toolbox { get; } = new Toolbox();
 
diff --git a/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs b/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs
index 75e352a5..3762fb5b 100644
--- a/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs
+++ b/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs
@@ -116,6 +116,8 @@ namespace UniversalEditor.UserInterface.Pages
 
 		public override string Title => EditorWindow.GetDocumentTitle(Document);
 
+		private Container tbEditorsAndViews = null;
+
 		private void RefreshEditor()
 		{
 			if (Document == null) return;
@@ -219,7 +221,7 @@ namespace UniversalEditor.UserInterface.Pages
 					// problem no longer manifests itself)
 					Controls.Clear();
 
-					Container tbEditorsAndViews = new Container();
+					tbEditorsAndViews = new Container();
 					tbEditorsAndViews.Layout = new GridLayout();
 					for (int i = 0; i < reditors.Length; i++)
 					{
@@ -235,6 +237,11 @@ namespace UniversalEditor.UserInterface.Pages
 						{
 							EditorView view = reditor.Views[j];
 							Button btn = new Button();
+							btn.CheckOnClick = true;
+							if (reditor.DefaultView != null && view == reditor.DefaultView)
+							{
+								btn.Checked = true;
+							}
 							btn.BorderStyle = ButtonBorderStyle.None;
 							btn.Text = view.Title;
 							btn.Click += tibEditorView_Click;
@@ -260,8 +267,22 @@ namespace UniversalEditor.UserInterface.Pages
 			}
 		}
 
+		internal void UpdateViewButton(EditorView view)
+		{
+			foreach (Control ctl in tbEditorsAndViews.Controls)
+			{
+				if (ctl is Button)
+				{
+					(ctl as Button).Checked = ctl.GetExtraData<EditorView>("view") == view;
+				}
+			}
+		}
+
 		private void tibEditorView_Click(object sender, EventArgs e)
 		{
+			if (tbEditorsAndViews == null)
+				return;
+
 			Button tib = (sender as Button);
 			Editor editor = tib.GetExtraData<Editor>("editor");
 			EditorView view = tib.GetExtraData<EditorView>("view");