diff --git a/src/datasource-zabbix/query.controller.js b/src/datasource-zabbix/query.controller.js
index ddd23b7..ca271cc 100644
--- a/src/datasource-zabbix/query.controller.js
+++ b/src/datasource-zabbix/query.controller.js
@@ -40,6 +40,11 @@ export class ZabbixQueryController extends QueryCtrl {
     // Update metric suggestion when template variable was changed
     $rootScope.$on('template-variable-value-updated', () => this.onVariableChange());
 
+    // Update metrics when item selected from dropdown
+    $scope.$on('typeahead-updated', () => {
+      this.onTargetBlur();
+    });
+
     this.init = function() {
       var target = this.target;