[Win] Respect host-set arrange mode

1 files changed, 4 insertions, 1 deletions

diff --git a/Xamarin.PropertyEditing.Windows/PropertyEditorPanel.cs b/Xamarin.PropertyEditing.Windows/PropertyEditorPanel.cs
index 3fa7203..7355e6e 100644
--- a/Xamarin.PropertyEditing.Windows/PropertyEditorPanel.cs
+++ b/Xamarin.PropertyEditing.Windows/PropertyEditorPanel.cs
@@ -102,7 +102,7 @@ namespace Xamarin.PropertyEditing.Windows
 			this.paneSelector.SelectedItemChanged += OnPaneChanged;
 			OnTargetPlatformChanged();
 
-			if (this.vm.SelectedObjects.Count > 0)
+			if (this.vm.SelectedObjects.Count > 0 || ArrangeMode != PropertyArrangeMode.Name)
 				OnArrangeModeChanged (ArrangeMode);
 		}
 
@@ -215,6 +215,9 @@ namespace Xamarin.PropertyEditing.Windows
 				itemsSource = new Binding ("ArrangedEditors");
 
 			this.items.SetBinding (ItemsControl.ItemsSourceProperty, itemsSource);
+
+			if (this.vm != null)
+				this.vm.ArrangeMode = newMode;
 		}
 	}