diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml
index 33a04260..aa502873 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml
@@ -6,18 +6,25 @@
                       Title="WatermarkTextBox">
     <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
         <TextBlock Text="The WatermarkTextBox is simply a TextBox that allows you to sepcify an object, usually a String, to represent null or missing text." />
-        
-        <StackPanel Grid.Row="1" Margin="10">
+
+        <GroupBox Header="Features" Grid.Row="1" >
+            <Grid Margin="5">
+                <CheckBox x:Name="_selectAll" Content="SelectAllOnGotFocus" VerticalAlignment="Center" Margin="5" ToolTip="Selects all text in the WatermarkTextBox when it receives focus." />
+            </Grid>
+        </GroupBox>
+
+        <StackPanel Grid.Row="2" Margin="10">
             <TextBlock Text="Default:" Style="{StaticResource Header}" />
-            <extToolkit:WatermarkTextBox Grid.Column="1" Margin="5" Watermark="Enter Text" />
+            <extToolkit:WatermarkTextBox Grid.Column="1" Margin="5" MinWidth="200" Watermark="Enter Text" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}"/>
 
             <TextBlock Text="Image Watermark:" Style="{StaticResource Header}" />
-            <extToolkit:WatermarkTextBox Grid.Column="1" Margin="5" >
+            <extToolkit:WatermarkTextBox Grid.Column="1" Margin="5" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}" >
                 <extToolkit:WatermarkTextBox.Watermark>
                     <StackPanel Orientation="Horizontal">
                         <Image Source="/Samples.Modules.Text;component/Images/PencilTool16.png" Stretch="None" />
@@ -27,7 +34,7 @@
             </extToolkit:WatermarkTextBox>
 
             <TextBlock Grid.Row="2" Text="Custom WatermarkTemplate:" Style="{StaticResource Header}" />
-            <extToolkit:WatermarkTextBox Grid.Row="2" Grid.Column="1" Margin="5" Watermark="Enter Text">
+            <extToolkit:WatermarkTextBox Grid.Row="2" Grid.Column="1" Margin="5" Watermark="Enter Text" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}">
                 <extToolkit:WatermarkTextBox.WatermarkTemplate>
                     <DataTemplate>
                         <Border BorderBrush="Green" BorderThickness="1" Padding="5" >
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
index de8bfa57..e308ac6b 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
@@ -61,6 +61,8 @@ namespace Microsoft.Windows.Controls
 
             if (SelectAllOnGotFocus)
                 SelectAll();
+            else
+                SelectionLength = 0;                
         }
 
         protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)