diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs
index f49d841fa..87a3eb6bb 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs
@@ -27,20 +27,20 @@ private void SwitchImage(object sender, ExecutedRoutedEventArgs e)
 
                 if (dialog.ShowDialog() == true)
                 {
-                    SetValue(UriPropertyKey, new Uri(dialog.FileName, UriKind.RelativeOrAbsolute));
-                    SetValue(PreviewBrushPropertyKey, new ImageBrush(BitmapFrame.Create(Uri, BitmapCreateOptions.IgnoreImageCache, BitmapCacheOption.None))
+                    SetValue(UriProperty, new Uri(dialog.FileName, UriKind.RelativeOrAbsolute));
+                    SetValue(PreviewBrushProperty, new ImageBrush(BitmapFrame.Create(Uri, BitmapCreateOptions.IgnoreImageCache, BitmapCacheOption.None))
                     {
                         Stretch = Stretch
                     });
-                    SetValue(HasValuePropertyKey, ValueBoxes.TrueBox);
+                    SetValue(HasValueProperty, ValueBoxes.TrueBox);
                     SetCurrentValue(ToolTipProperty, dialog.FileName);
                 }
             }
             else
             {
-                SetValue(UriPropertyKey, default(Uri));
-                SetValue(PreviewBrushPropertyKey, default(Brush));
-                SetValue(HasValuePropertyKey, ValueBoxes.FalseBox);
+                SetValue(UriProperty, default(Uri));
+                SetValue(PreviewBrushProperty, default(Brush));
+                SetValue(HasValueProperty, ValueBoxes.FalseBox);
                 SetCurrentValue(ToolTipProperty, default);
             }
         }
@@ -54,21 +54,18 @@ public Stretch Stretch
             set => SetValue(StretchProperty, value);
         }
 
-        public static readonly DependencyPropertyKey UriPropertyKey = DependencyProperty.RegisterReadOnly(
+        public static DependencyProperty UriProperty = DependencyProperty.Register(
             "Uri", typeof(Uri), typeof(ImageSelector), new PropertyMetadata(default(Uri)));
 
-        public static readonly DependencyProperty UriProperty = UriPropertyKey.DependencyProperty;
-
         public Uri Uri
         {
             get => (Uri) GetValue(UriProperty);
             set => SetValue(UriProperty, value);
         }
 
-        public static readonly DependencyPropertyKey PreviewBrushPropertyKey = DependencyProperty.RegisterReadOnly(
-            "PreviewBrush", typeof(Brush), typeof(ImageSelector), new PropertyMetadata(default(Brush)));
 
-        public static readonly DependencyProperty PreviewBrushProperty = PreviewBrushPropertyKey.DependencyProperty;
+        public static readonly DependencyProperty PreviewBrushProperty = DependencyProperty.Register(
+            "PreviewBrush", typeof(Brush), typeof(ImageSelector), new PropertyMetadata(default(Brush)));
 
         public Brush PreviewBrush
         {
@@ -112,11 +109,9 @@ public string Filter
             set => SetValue(FilterProperty, value);
         }
 
-        public static readonly DependencyPropertyKey HasValuePropertyKey = DependencyProperty.RegisterReadOnly(
+        public static readonly DependencyProperty HasValueProperty = DependencyProperty.Register(
             "HasValue", typeof(bool), typeof(ImageSelector), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public static readonly DependencyProperty HasValueProperty = HasValuePropertyKey.DependencyProperty;
-
         public bool HasValue
         {
             get => (bool) GetValue(HasValueProperty);