1 files changed, 4 insertions, 2 deletions
diff --git a/Xamarin.PropertyEditing.Windows/SolidBrushEditorControl.cs b/Xamarin.PropertyEditing.Windows/SolidBrushEditorControl.cs
index 4ca3403..9190c47 100644
--- a/Xamarin.PropertyEditing.Windows/SolidBrushEditorControl.cs
+++ b/Xamarin.PropertyEditing.Windows/SolidBrushEditorControl.cs
@@ -15,12 +15,14 @@ namespace Xamarin.PropertyEditing.Windows
 
 		ComboBox colorSpacePicker;
 
-		SolidBrushPropertyViewModel ViewModel => DataContext as SolidBrushPropertyViewModel;
+		BrushPropertyViewModel ViewModel => DataContext as BrushPropertyViewModel;
 
 		public override void OnApplyTemplate ()
 		{
 			base.OnApplyTemplate ();
 
+			if (ViewModel == null) return;
+
 			colorSpacePicker = (ComboBox)GetTemplateChild ("colorSpacePicker");
 			if (ViewModel.ColorSpaces == null || ViewModel.ColorSpaces.Count == 0) {
 				colorSpacePicker.Visibility = Visibility.Collapsed;
@@ -30,7 +32,7 @@ namespace Xamarin.PropertyEditing.Windows
 				// Handle color space changes
 				colorSpacePicker.SelectionChanged += (s, e) => {
 					if (ViewModel != null && ViewModel.Value != null) {
-						ViewModel.Value = new CommonSolidBrush (ViewModel.Value.Color, (string)e.AddedItems[0]);
+						ViewModel.Value = new CommonSolidBrush (ViewModel.Color, (string)e.AddedItems[0]);
 					}
 				};
 			}