diff --git a/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js b/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
index 512cfd407cb44..bf21e2f3a3bb6 100644
--- a/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
+++ b/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
@@ -84,7 +84,7 @@ app.service('savedVisualizations', function (Promise, es, kbnIndex, SavedVis, Pr
       body = {
         query: {
           simple_query_string: {
-            query: searchString + '*',
+            query: searchString + (['/', '!', '?', '&', '=', '%'].indexOf(searchString[searchString.length - 1]) === -1 ? '' : ' ') + '*',
             fields: ['title^3', 'description'],
             default_operator: 'AND'
           }