diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs b/src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs
index d80c0e26..56271dff 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs
@@ -122,7 +122,9 @@ namespace HandyControl.Controls
 
         private void HideAdornerElement()
         {
+            if (_adornerContainer == null) return;
             var layer = AdornerLayer.GetAdornerLayer(Target);
+
             if (layer != null)
             {
                 layer.Remove(_adornerContainer);
diff --git a/src/Shared/HandyControl_Shared/Themes/Basic/Colors/ColorsDark.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Colors/ColorsDark.xaml
index 64fab76d..e89a8ee0 100644
--- a/src/Shared/HandyControl_Shared/Themes/Basic/Colors/ColorsDark.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Basic/Colors/ColorsDark.xaml
@@ -23,7 +23,7 @@
     <Color x:Key="ReverseTextColor">#212121</Color>
     <Color x:Key="TextIconColor">White</Color>
 
-    <Color x:Key="BorderColor">#3f3f46</Color>
+    <Color x:Key="BorderColor">#202020</Color>
     <Color x:Key="SecondaryBorderColor">#555555</Color>
     <Color x:Key="BackgroundColor">#eeeeee</Color>
     <Color x:Key="RegionColor">#1c1c1c</Color>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PinBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PinBoxBaseStyle.xaml
index a81214d7..d4236bcd 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PinBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PinBoxBaseStyle.xaml
@@ -7,6 +7,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="PinBoxBaseStyle" TargetType="controls:PinBox">
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="ItemMargin" Value="4,0"/>
         <Setter Property="ItemWidth" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="ItemHeight" Value="{StaticResource DefaultControlHeight}"/>