diff --git a/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs b/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
index c60e205..0c0f67d 100644
--- a/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
+++ b/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
@@ -197,6 +197,7 @@ public abstract class NumericUpDown : TemplatedControl
     private void OnDragPanelPointerPressed(object sender, PointerPressedEventArgs e)
     {
         _point = e.GetPosition(this);
+        _textBox?.Focus();
     }
     
     private void OnDragPanelPointerReleased(object sender, PointerReleasedEventArgs e)
@@ -476,7 +477,6 @@ public abstract class NumericUpDownBase<T>: NumericUpDown where T: struct, IComp
             {
                 try
                 {
-                    // TODO
                     var newValue = ConvertTextToValue(text);
                     if (EmptyInputValue is not null && newValue is null)
                     {