diff --git a/sphinx/websupport/search/__init__.py b/sphinx/websupport/search/__init__.py
index e7164205d..b4bf73868 100644
--- a/sphinx/websupport/search/__init__.py
+++ b/sphinx/websupport/search/__init__.py
@@ -25,7 +25,7 @@ class BaseSearch(object):
         raise NotImplemented
 
     def query(self, q):
-        self.context_re = re.compile(q, re.I)
+        self.context_re = re.compile('|'.join(q.split()), re.I)
         return self.handle_query(q)
 
     def handle_query(self, q):