diff --git a/src/app/partials/influxdb/editor.html b/src/app/partials/influxdb/editor.html
index cbd26ef9e01..4e070999e7f 100644
--- a/src/app/partials/influxdb/editor.html
+++ b/src/app/partials/influxdb/editor.html
@@ -95,6 +95,7 @@
           <li>
             <a class="grafana-target-segment"
                ng-click="target.condition_filter = !target.condition_filter; get_data();"
+               bs-tooltip="'Add a where clause'"
                role="menuitem">
               <i class="icon-filter"></i>
             </a>
@@ -140,6 +141,7 @@
           <li>
             <a class="grafana-target-segment"
                ng-click="target.groupby_field_add = !target.groupby_field_add; get_data();"
+               bs-tooltip="'Add a group by column'"
                role="menuitem">
               <i class="icon-plus"></i>
             </a>