diff --git a/view/templates/item/compose-footer.tpl b/view/templates/item/compose-footer.tpl
index 697be6fd1..9e950b98d 100644
--- a/view/templates/item/compose-footer.tpl
+++ b/view/templates/item/compose-footer.tpl
@@ -118,7 +118,6 @@
 
 		$acl_allow_input.tagsinput({
 			confirmKeys: [13, 44],
-			cancelConfirmKeysOnEmpty: true,
 			freeInput: false,
 			tagClass: function(item) {
 				switch (item.type) {
diff --git a/view/theme/frio/frameworks/friendica-tagsinput/friendica-tagsinput.js b/view/theme/frio/frameworks/friendica-tagsinput/friendica-tagsinput.js
index 2e83eedc6..af722d789 100644
--- a/view/theme/frio/frameworks/friendica-tagsinput/friendica-tagsinput.js
+++ b/view/theme/frio/frameworks/friendica-tagsinput/friendica-tagsinput.js
@@ -481,9 +481,9 @@
 
         var text = $input.val(),
             maxLengthReached = self.options.maxChars && text.length >= self.options.maxChars;
-        if (self.options.freeInput && (keyCombinationInList(event, self.options.confirmKeys) || maxLengthReached)) {
+        if (keyCombinationInList(event, self.options.confirmKeys) || maxLengthReached) {
           // Only attempt to add a tag if there is data in the field
-          if (text.length !== 0) {
+          if (self.options.freeInput && text.length !== 0) {
             self.add(maxLengthReached ? text.substr(0, self.options.maxChars) : text);
             $input.val('');
           }