diff --git a/core/misc/autocomplete.es6.js b/core/misc/autocomplete.es6.js
index 5a1c156..076c48a 100644
--- a/core/misc/autocomplete.es6.js
+++ b/core/misc/autocomplete.es6.js
@@ -177,12 +177,8 @@
     // Remove the current input.
     terms.pop();
     // Add the selected item.
-    if (ui.item.value.search(',') > 0) {
-      terms.push('"' + ui.item.value + '"');
-    }
-    else {
-      terms.push(ui.item.value);
-    }
+    terms.push(ui.item.value);
+
     event.target.value = terms.join(', ');
     // Return false to tell jQuery UI that we've filled in the value already.
     return false;
diff --git a/core/misc/autocomplete.js b/core/misc/autocomplete.js
index c2419a4..5d1dd06 100644
--- a/core/misc/autocomplete.js
+++ b/core/misc/autocomplete.js
@@ -101,11 +101,8 @@
 
     terms.pop();
 
-    if (ui.item.value.search(',') > 0) {
-      terms.push('"' + ui.item.value + '"');
-    } else {
-      terms.push(ui.item.value);
-    }
+    terms.push(ui.item.value);
+
     event.target.value = terms.join(', ');
 
     return false;