diff --git a/app/assets/javascripts/filtered_search/dropdown_non_user.js.es6 b/app/assets/javascripts/filtered_search/dropdown_non_user.js.es6
index 0969df65836..84abaa920d6 100644
--- a/app/assets/javascripts/filtered_search/dropdown_non_user.js.es6
+++ b/app/assets/javascripts/filtered_search/dropdown_non_user.js.es6
@@ -29,7 +29,6 @@
       let escapedText = text;
       const hasSpace = text.indexOf(' ') !== -1;
       const hasDoubleQuote = text.indexOf('"') !== -1;
-      const hasSingleQuote = text.indexOf('\'') !== -1;
 
       // Encapsulate value with quotes if it has spaces
       // Known side effect: values's with both single and double quotes
@@ -37,7 +36,8 @@
       if (hasSpace) {
         if (hasDoubleQuote) {
           escapedText = `'${text}'`;
-        } else if (hasSingleQuote) {
+        } else {
+          // Encapsulate singleQuotes or if it hasSpace
           escapedText = `"${text}"`;
         }
       }