1 files changed, 3 insertions, 1 deletions
diff --git a/web-ui/app/js/mail_view/ui/mail_view.js b/web-ui/app/js/mail_view/ui/mail_view.js
index 66b33748..eb55dbd5 100644
--- a/web-ui/app/js/mail_view/ui/mail_view.js
+++ b/web-ui/app/js/mail_view/ui/mail_view.js
@@ -157,7 +157,9 @@ define(
 
         if (event.which === ENTER_KEY){
           event.preventDefault();
-          this.createNewTag();
+          if (this.select('newTagInput').val() !== '') {
+            this.createNewTag();
+          }
         } else if (event.which === ESC_KEY) {
           event.preventDefault();
           this.addTagLoseFocus();