diff --git a/src/tags/TagsView.cpp b/src/tags/TagsView.cpp
index f5aef91ae..2a127755d 100644
--- a/src/tags/TagsView.cpp
+++ b/src/tags/TagsView.cpp
@@ -151,6 +151,11 @@ void TagsView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 
 void TagsView::addTag()
 {
+	if (tagInput->GetText().length() < 4)
+	{
+		new ErrorMessage("Tag not long enough", "Must be at least 4 letters");
+		return;
+	}
 	try
 	{
 		c->AddTag(tagInput->GetText());