diff --git a/view/js/acl.js b/view/js/acl.js
index d01ffe7cb..b50dbaec8 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -109,7 +109,14 @@ ACL.prototype.search = function(){
 
 ACL.prototype.on_search = function(event){
 	if (this.kp_timer) clearTimeout(this.kp_timer);
-	this.kp_timer = setTimeout( this.search.bind(this), 1000);
+
+	// Triggers an immediate search while preventing form submission
+	if (event.key === 'Enter') {
+		this.search();
+		event.preventDefault();
+	} else {
+		this.kp_timer = setTimeout( this.search.bind(this), 500);
+	}
 };
 
 ACL.prototype.on_showall = function(event){
diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl
index 6755f2a19..da86a478b 100644
--- a/view/templates/acl_selector.tpl
+++ b/view/templates/acl_selector.tpl
@@ -1,6 +1,6 @@
 
 <div id="acl-wrapper">
-	<input id="acl-search">
+	<input id="acl-search" autocomplete="off">
 	<a id="acl-showall">{{$showall}}</a>
 	<div id="acl-list">
 		<div id="acl-list-content">
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('');
           }
diff --git a/view/theme/frio/templates/acl_selector.tpl b/view/theme/frio/templates/acl_selector.tpl
index a96271671..47415634d 100644
--- a/view/theme/frio/templates/acl_selector.tpl
+++ b/view/theme/frio/templates/acl_selector.tpl
@@ -4,7 +4,7 @@
 		<button id="acl-showall" class="btn btn-block btn-default"><i class="fa fa-globe"></i> {{$showall}}</button>
 	</div>
 	<div class="form-group form-group-search">
-		<input type="text" id="acl-search" class="form-control form-search">
+		<input type="text" id="acl-search" class="form-control form-search" autocomplete="off">
 	</div>
 	<div id="acl-list">
 		<div id="acl-list-content"></div>