diff --git a/view/js/acl.js b/view/js/acl.js
index d01ffe7cbd..b50dbaec8d 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 6755f2a198..da86a478bf 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/theme/frio/templates/acl_selector.tpl b/view/theme/frio/templates/acl_selector.tpl
index a96271671b..47415634d1 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>