diff --git a/src/client/spark/view/Extensions/TextElement/TextBoxBehavior.cs b/src/client/spark/view/Extensions/TextElement/TextBoxBehavior.cs
index 8362c3a4b..45ad9e0d8 100644
--- a/src/client/spark/view/Extensions/TextElement/TextBoxBehavior.cs
+++ b/src/client/spark/view/Extensions/TextElement/TextBoxBehavior.cs
@@ -59,8 +59,10 @@ namespace mbts.ui {
             {
                EnterKeyBehavior.Commit,
                (s, e) => {
-                  if (e.Key == Key.Enter)
+                  if (e.Key == Key.Enter) {
                      BindingOperations.GetBindingExpression(s as DependencyObject, TextBox.TextProperty)?.UpdateSource();
+                     e.Handled = true;
+                  }
                }
             },
             {
@@ -69,6 +71,7 @@ namespace mbts.ui {
                   if (e.Key == Key.Enter) {
                      BindingOperations.GetBindingExpression(s as DependencyObject, TextBox.TextProperty)?.UpdateSource();
                      Keyboard.ClearFocus();
+                     e.Handled = true;
                   }
                }
             }