diff --git a/src/Ursa.Themes.Semi/Controls/TagInput.axaml b/src/Ursa.Themes.Semi/Controls/TagInput.axaml
index 47cf6c6..7a43ce9 100644
--- a/src/Ursa.Themes.Semi/Controls/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Controls/TagInput.axaml
@@ -17,8 +17,8 @@
             <ControlTemplate TargetType="u:TagInput">
                 <Border
                     MinHeight="30"
-                    Padding="4"
-                    VerticalAlignment="Top"
+                    Padding="8,4"
+                    VerticalAlignment="Stretch"
                     Background="{DynamicResource SemiColorFill0}"
                     CornerRadius="3">
                     <Panel HorizontalAlignment="Stretch">
@@ -55,7 +55,7 @@
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="Template">
             <ControlTemplate TargetType="TextBox">
-                <Border>
+                <Border Padding="0,4">
                     <ScrollViewer
                         Width="{Binding $parent[TextBox].Bounds.Width}"
                         AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
diff --git a/src/Ursa/Controls/TagInput/TagInput.cs b/src/Ursa/Controls/TagInput/TagInput.cs
index ad568a9..fb64d1a 100644
--- a/src/Ursa/Controls/TagInput/TagInput.cs
+++ b/src/Ursa/Controls/TagInput/TagInput.cs
@@ -139,7 +139,7 @@ public class TagInput: TemplatedControl
 
     public void Close(object o)
     {
-        if (o is ClosableTag t)
+        if (o is Control t)
         {
             var presenter = t.Parent as ContentPresenter;
             if (presenter != null)