diff --git a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
index 2b996b19e17..b338e5d227f 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
@@ -63,9 +63,9 @@
 					Drop first & last value
 				</li>
 				<li class="tight-form-item">
-					<input class="cr1" type="checkbox" id="agg[{{agg.id}}].settings.dropFirstLast"
+					<input class="cr1" type="checkbox" id="{{$id}}.dropFirstLast"
 					ng-model="agg.settings.dropFirstLast" ng-checked="agg.settings.dropFirstLast" ng-change="onChangeInternal()">
-					<label for="agg[{{agg.id}}].settings.dropFirstLast" class="cr1"></label>
+					<label for="{{$id}}.dropFirstLast" class="cr1"></label>
 				</li>
 				<li class="tight-form-item last">
 					<i class="fa fa-question-circle" bs-tooltip="'Ignore the first and last values of the dataset'" data-placement="right"></i>