diff --git a/src/Ursa/Controls/TagInput/TagInput.cs b/src/Ursa/Controls/TagInput/TagInput.cs
index 687a3ff..f499dd1 100644
--- a/src/Ursa/Controls/TagInput/TagInput.cs
+++ b/src/Ursa/Controls/TagInput/TagInput.cs
@@ -272,6 +272,7 @@ public class TagInput : TemplatedControl
     private void AddTags()
     {
         if (!(_textBox.Text?.Length > 0)) return;
+        if (Tags.Count >= MaxCount) return;
         string[] values;
         if (!string.IsNullOrEmpty(Separator))
             values = _textBox.Text.Split(new[] { Separator },