diff --git a/src/app/partials/influxdb/editor.html b/src/app/partials/influxdb/editor.html
index bbf4cbd5df4..cbd26ef9e01 100644
--- a/src/app/partials/influxdb/editor.html
+++ b/src/app/partials/influxdb/editor.html
@@ -94,12 +94,12 @@
           </li>
           <li>
             <a class="grafana-target-segment"
-               ng-click="target.condiction_filter = !target.condiction_filter; get_data();"
+               ng-click="target.condition_filter = !target.condition_filter; get_data();"
                role="menuitem">
               <i class="icon-filter"></i>
             </a>
           </li>
-          <li ng-show="target.condiction_filter">
+          <li ng-show="target.condition_filter">
             <select class="input-small grafana-target-segment-input"
                     ng-change="get_data()"
                     ng-model="target.condition_add"
diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js
index 4e72e93b586..bf4d64190ae 100644
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -89,10 +89,10 @@ function (angular, _, kbn) {
             func: target.function,
             timeFilter: timeFilter,
             interval: target.interval || options.interval,
-            condition_add: target.condiction_filter ? target.condition_add : '',
-            condition_key: target.condiction_filter ? target.condition_key : '',
-            condition_op: target.condiction_filter ? target.condition_op : '',
-            condition_value: target.condiction_filter ? target.condition_value : '',
+            condition_add: target.condition_filter ? target.condition_add : '',
+            condition_key: target.condition_filter ? target.condition_key : '',
+            condition_op: target.condition_filter ? target.condition_op : '',
+            condition_value: target.condition_filter ? target.condition_value : '',
             group_add: target.groupby_field_add && target.groupby_field ? ',' : '',
             group: target.groupby_field_add ? target.groupby_field : '',
           };