diff --git a/public/app/core/directives/misc.js b/public/app/core/directives/misc.js
index 8e1791af46c..ff005e76b64 100644
--- a/public/app/core/directives/misc.js
+++ b/public/app/core/directives/misc.js
@@ -1,9 +1,10 @@
 define([
   'angular',
+  'require',
   '../core_module',
   'app/core/utils/kbn',
 ],
-function (angular, coreModule, kbn) {
+function (angular, require, coreModule, kbn) {
   'use strict';
 
   coreModule.default.directive('tip', function($compile) {
@@ -18,6 +19,20 @@ function (angular, coreModule, kbn) {
     };
   });
 
+  coreModule.default.directive('clipboardButton',function() {
+    return function(scope, elem) {
+      require(['vendor/clipboard/dist/clipboard'], function(Clipboard) {
+        scope.clipboard = new Clipboard(elem[0]);
+      });
+
+      scope.$on('$destroy', function() {
+        if (scope.clipboard) {
+          scope.clipboard.destroy();
+        }
+      });
+    };
+  });
+
   coreModule.default.directive('watchChange', function() {
     return {
       scope: { onchange: '&watchChange' },
diff --git a/public/app/features/dashboard/shareModalCtrl.js b/public/app/features/dashboard/shareModalCtrl.js
index 6f3cb320bef..10f6a62fc3e 100644
--- a/public/app/features/dashboard/shareModalCtrl.js
+++ b/public/app/features/dashboard/shareModalCtrl.js
@@ -2,10 +2,9 @@ define(['angular',
   'lodash',
   'jquery',
   'moment',
-  'require',
   'app/core/config',
 ],
-function (angular, _, $, moment, require, config) {
+function (angular, _, $, moment, config) {
   'use strict';
 
   var module = angular.module('grafana.controllers');
@@ -91,18 +90,4 @@ function (angular, _, $, moment, require, config) {
 
   });
 
-  module.directive('clipboardButton',function() {
-    return function(scope, elem) {
-      require(['vendor/clipboard/dist/clipboard'], function(Clipboard) {
-        scope.clipboard = new Clipboard(elem[0]);
-      });
-
-      scope.$on('$destroy', function() {
-        if (scope.clipboard) {
-          scope.clipboard.destroy();
-        }
-      });
-    };
-  });
-
 });
diff --git a/public/app/features/panel/query_troubleshooter.ts b/public/app/features/panel/query_troubleshooter.ts
index 7d5e4dd0e9c..08388eb1b5e 100644
--- a/public/app/features/panel/query_troubleshooter.ts
+++ b/public/app/features/panel/query_troubleshooter.ts
@@ -8,7 +8,13 @@ const template = `
 <collapse-box title="Query Troubleshooter" is-open="ctrl.isOpen" state-changed="ctrl.stateChanged()"
               ng-class="{'collapse-box--error': ctrl.hasError}">
   <collapse-box-actions>
-    <a class="pointer"><i class="fa fa-clipboard"></i> Copy to clipboard</a>
+    <a class="pointer" ng-click="ctrl.toggleExpand()" ng-hide="ctrl.allNodesExpanded">
+      <i class="fa fa-expand"></i> Expand All
+    </a>
+    <a class="pointer" ng-click="ctrl.toggleExpand()" ng-show="ctrl.allNodesExpanded">
+      <i class="fa fa-expand"></i> Collapse All
+    </a>
+    <a class="pointer" data-clipboard-text="adasda" clipboard-button><i class="fa fa-clipboard"></i> Copy to Clipboard</a>
   </collapse-box-actions>
   <collapse-box-body>
     <div class="query-troubleshooter-json"></div>
@@ -24,6 +30,8 @@ export class QueryTroubleshooterCtrl {
   onRequestErrorEventListener: any;
   onRequestResponseEventListener: any;
   hasError: boolean;
+  allNodesExpanded: boolean;
+  jsonExplorer: JsonExplorer;
 
   /** @ngInject **/
   constructor($scope, private $timeout) {
@@ -46,7 +54,6 @@ export class QueryTroubleshooterCtrl {
   }
 
   stateChanged() {
-    console.log(this.isOpen);
     if (this.isOpen) {
       appEvents.on('ds-request-response', this.onRequestResponseEventListener);
       this.panelCtrl.refresh();
@@ -87,6 +94,13 @@ export class QueryTroubleshooterCtrl {
 
     this.$timeout(_.partial(this.renderJsonExplorer, data));
   }
+
+  toggleExpand(depth) {
+    if (this.jsonExplorer) {
+      this.allNodesExpanded = !this.allNodesExpanded;
+      this.jsonExplorer.openAtDepth(this.allNodesExpanded ? 20 : 1);
+    }
+  }
 }
 
 export function queryTroubleshooter() {
@@ -104,11 +118,11 @@ export function queryTroubleshooter() {
       ctrl.renderJsonExplorer = function(data) {
         var jsonElem = elem.find('.query-troubleshooter-json');
 
-        const formatter =  new JsonExplorer(data, 3, {
+        ctrl.jsonExplorer =  new JsonExplorer(data, 3, {
           theme: 'dark',
         });
 
-        const html = formatter.render(true);
+        const html = ctrl.jsonExplorer.render(true);
         jsonElem.html(html);
       };
     }
diff --git a/public/sass/components/_collapse_box.scss b/public/sass/components/_collapse_box.scss
index 96835ba9db9..38dbb3d8ca6 100644
--- a/public/sass/components/_collapse_box.scss
+++ b/public/sass/components/_collapse_box.scss
@@ -35,3 +35,10 @@
   @include border-radius($label-border-radius-sm);
 }
 
+.collapse-box__header-actions {
+  display: flex;
+  flex-direction: row;
+  a {
+    margin-left: $spacer;
+  }
+}