diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
index e308ac6b..ea3e19a8 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
@@ -60,9 +60,7 @@ namespace Microsoft.Windows.Controls
             base.OnGotKeyboardFocus(e);
 
             if (SelectAllOnGotFocus)
-                SelectAll();
-            else
-                SelectionLength = 0;                
+                SelectAll();              
         }
 
         protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)