diff --git a/src/utils/emoji-index.js b/src/utils/emoji-index.js
index bebd41c..b73c64f 100644
--- a/src/utils/emoji-index.js
+++ b/src/utils/emoji-index.js
@@ -24,7 +24,7 @@ function search(value, maxResults = 75) {
   var results = null
 
   if (value.length) {
-    var values = value.toLowerCase().split(/[\s|,]+/),
+    var values = value.toLowerCase().split(/[\s|,|\-|_]+/),
         allResults = []
 
     if (values.length > 2) {