diff --git a/panels/derivequeries/module.js b/panels/derivequeries/module.js
index e62d065439d..b18bf0c6092 100644
--- a/panels/derivequeries/module.js
+++ b/panels/derivequeries/module.js
@@ -85,9 +85,9 @@ angular.module('kibana.derivequeries', [])
       if ($scope.panel.query === '' || $scope.panel.mode === 'terms only') {
         var suffix = '';
       } else if ($scope.panel.mode === 'AND') {
-        var suffix = ' AND ' + $scope.panel.query;
+        var suffix = ' AND (' + $scope.panel.query + ')';
       } else if ($scope.panel.mode === 'OR') {
-        var suffix = ' OR ' + $scope.panel.query;
+        var suffix = ' OR (' + $scope.panel.query + ')';
       }
       _.each(results.facets.query.terms, function(v) {
         data.push($scope.panel.field+':"'+v.term+'"'+suffix)