diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorPicker.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorPicker.cs
index 6e6b86b9..0d767f6f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorPicker.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/ColorPicker.cs
@@ -257,6 +257,8 @@ namespace Microsoft.Windows.Controls
 
             _okButton = (Button)GetTemplateChild("PART_OkButton");
             _okButton.Click += OkButton_Click;
+
+            SetSelectedColor(SelectedColor);
         }
 
         #endregion //Base Class Overrides
@@ -363,6 +365,9 @@ namespace Microsoft.Windows.Controls
 
         private void UpdateColorShadeSelectorPosition(Color color)
         {
+            if (_spectrumSlider == null || _colorShadingCanvas == null)
+                return;
+
             _currentColorPosition = null;
 
             HsvColor hsv = ColorUtilities.ConvertRgbToHsv(color.R, color.G, color.B);
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml
index 7b03163c..daccf2c4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml
@@ -189,7 +189,7 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsTabStop="False" Focusable="False" />
                         <Rectangle x:Name="overlay" Style="{TemplateBinding OverlayStyle}"/>
                         <ContentPresenter x:Name="busycontent">
                             <ContentPresenter.Content>