diff --git a/src/BreCalClient/DateTimePickerExt.cs b/src/BreCalClient/DateTimePickerExt.cs
index e448d34..2134bbd 100644
--- a/src/BreCalClient/DateTimePickerExt.cs
+++ b/src/BreCalClient/DateTimePickerExt.cs
@@ -20,24 +20,42 @@ namespace BreCalClient
                 e.Handled = true;
                 tb.Text = Regex.Replace(text, @"(\d{2})(\d)", "$1.$2");
                 tb.CaretIndex = tb.Text.Length;
+                tb.SelectedText = "";
             }
             else if (Regex.IsMatch(text, @"^(\d{2}\.\d{3})"))
             {
                 e.Handled = true;
                 tb.Text = Regex.Replace(text, @"^(\d{2}\.\d{2})(\d)", "$1.$2");
                 tb.CaretIndex = tb.Text.Length;
+                tb.SelectedText = "";
             }
             else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{2} \d{3})"))
             {
                 e.Handled = true;
                 tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{2} \d{2})(\d)", "$1:$2");
                 tb.CaretIndex = tb.Text.Length;
+                tb.SelectedText = "";
+            }
+            else if (Regex.IsMatch(text, @"^(\d{2}\.\d\.\d{2} \d{3})"))
+            {
+                e.Handled = true;
+                tb.Text = Regex.Replace(text, @"(\d{2}\.\d\.\d{2} \d{2})(\d)", "$1:$2");
+                tb.CaretIndex = tb.Text.Length;
+                tb.SelectedText = "";
             }
             else if (Regex.IsMatch(text, @"^(\d{2}\.\d{2}\.\d{4} \d{3})"))
             {
                 e.Handled = true;
                 tb.Text = Regex.Replace(text, @"(\d{2}\.\d{2}\.\d{4} \d{2})(\d)", "$1:$2");
                 tb.CaretIndex = tb.Text.Length;
+                tb.SelectedText = "";
+            }
+            else if (Regex.IsMatch(text, @"^(\d{2}\.\d\.\d{4} \d{3})"))
+            {
+                e.Handled = true;
+                tb.Text = Regex.Replace(text, @"(\d{2}\.\d\.\d{4} \d{2})(\d)", "$1:$2");
+                tb.CaretIndex = tb.Text.Length;
+                tb.SelectedText = null;
             }
         }
     }