diff --git a/ui/src/core/xibo-cms.js b/ui/src/core/xibo-cms.js
index 8aa7067e29..3660724d5d 100644
--- a/ui/src/core/xibo-cms.js
+++ b/ui/src/core/xibo-cms.js
@@ -546,6 +546,15 @@ function XiboInitialise(scope) {
             // Normal tags input
             $(self).tagsinput();
         }
+
+        // When tagsinput loses focus, add the tag,
+        // do not rely solely on comma or selection from suggestions
+        $('.bootstrap-tagsinput input').blur(function() {
+            if ($(this).val() !== '') {
+                $(self).tagsinput('add', $(this).val());
+                $(this).val('');
+            }
+        });
     });
 
     // Initialize tag with values function from xibo-forms.js