diff --git a/public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts b/public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
index 3a0b7a40a4e..0513677c3f9 100644
--- a/public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
+++ b/public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
@@ -32,7 +32,7 @@ export class StackdriverFilterCtrl {
 
   /** @ngInject */
   constructor(private $scope, private uiSegmentSrv, private templateSrv, private $rootScope) {
-    this.$scope = $scope.$parent;
+    this.$scope = $scope.hasOwnProperty('groupBysChanged') ? $scope : $scope.$parent;
 
     this.initSegments(this.$scope.hideGroupBys);
   }