diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html
index e7f2916..86dbcc2 100644
--- a/zabbix/partials/query.editor.html
+++ b/zabbix/partials/query.editor.html
@@ -19,11 +19,11 @@
               <!-- Switch to IT Services editor -->
               <li role="menuitem" ng-hide="target.ITService">
                 <a class="pointer" tabindex="1"
-                   ng-click="target.ITService = true">IT Services</a>
+                   ng-click="switchEditorMode()">IT Services</a>
               </li>
               <li role="menuitem" ng-show="target.ITService">
                 <a class="pointer" tabindex="1"
-                   ng-click="target.ITService = false">Items</a>
+                   ng-click="switchEditorMode()">Items</a>
               </li>
               <li role="menuitem"><a tabindex="1" ng-click="duplicate()">Duplicate</a></li>
               <li role="menuitem"><a tabindex="1" ng-click="moveMetricQuery($index, $index-1)">Move up</a></li>
diff --git a/zabbix/queryCtrl.js b/zabbix/queryCtrl.js
index bca12e5..4fc469e 100644
--- a/zabbix/queryCtrl.js
+++ b/zabbix/queryCtrl.js
@@ -42,6 +42,11 @@ function (angular, _) {
       $scope.target.errors = validateTarget($scope.target);
     };
 
+    $scope.switchEditorMode = function() {
+      $scope.target.ITService = !$scope.target.ITService;
+      $scope.init();
+    };
+
     /**
      * Take alias from item name by default
      */