diff --git a/src/calibre/gui2/dialogs/search.py b/src/calibre/gui2/dialogs/search.py
index 5b010ee046..5292233dc9 100644
--- a/src/calibre/gui2/dialogs/search.py
+++ b/src/calibre/gui2/dialogs/search.py
@@ -176,7 +176,10 @@ class SearchDialog(QDialog, Ui_Dialog):
         if none:
             ans += (' and not ' if ans else 'not ') + none
         if any:
-            ans += (' or ' if ans else '') + any
+            if ans:
+                ans += ' and (' + any + ')'
+            else:
+                ans = any
         return ans
 
     def token(self):