diff --git a/public/app/plugins/panel/heatmap/axes_editor.ts b/public/app/plugins/panel/heatmap/axes_editor.ts
index 7a77ea718d9..761a0680184 100644
--- a/public/app/plugins/panel/heatmap/axes_editor.ts
+++ b/public/app/plugins/panel/heatmap/axes_editor.ts
@@ -1,8 +1,6 @@
-import kbn from 'app/core/utils/kbn';
 export class AxesEditorCtrl {
   panel: any;
   panelCtrl: any;
-  unitFormats: any;
   logScales: any;
   dataFormats: any;
   yBucketBoundModes: any;
@@ -12,7 +10,6 @@ export class AxesEditorCtrl {
     $scope.editor = this;
     this.panelCtrl = $scope.ctrl;
     this.panel = this.panelCtrl.panel;
-    this.unitFormats = kbn.getUnitFormats();
 
     this.logScales = {
       linear: 1,
@@ -35,10 +32,10 @@ export class AxesEditorCtrl {
     };
   }
 
-  setUnitFormat(subItem: any) {
-    this.panel.yAxis.format = subItem.value;
+  setUnitFormat = (unit: string) => {
+    this.panel.yAxis.format = unit;
     this.panelCtrl.render();
-  }
+  };
 }
 
 /** @ngInject */
diff --git a/public/app/plugins/panel/heatmap/partials/axes_editor.html b/public/app/plugins/panel/heatmap/partials/axes_editor.html
index a89002f0831..aacb122ec77 100644
--- a/public/app/plugins/panel/heatmap/partials/axes_editor.html
+++ b/public/app/plugins/panel/heatmap/partials/axes_editor.html
@@ -3,11 +3,7 @@
     <h5 class="section-heading">Y Axis</h5>
     <div class="gf-form">
       <label class="gf-form-label width-8">Unit</label>
-      <div class="gf-form-dropdown-typeahead width-12"
-           ng-model="ctrl.panel.yAxis.format"
-           dropdown-typeahead2="editor.unitFormats"
-           dropdown-typeahead-on-select="editor.setUnitFormat($subItem)">
-      </div>
+      <unit-picker onChange="editor.setUnitFormat" value="ctrl.panel.yAxis.format" class="width-12"></unit-picker>
     </div>
     <div ng-if="ctrl.panel.dataFormat == 'timeseries'">
       <div class="gf-form">
@@ -51,7 +47,7 @@
     <h5 class="section-heading">Buckets</h5>
     <div class="gf-form-inline">
       <div class="gf-form">
-        <label class="gf-form-label width-5">Y Axis</label>
+        <label class="gf-form-label width-4">Y Axis</label>
       </div>
       <div class="gf-form" ng-show="ctrl.panel.yAxis.logBase === 1">
         <label class="gf-form-label width-5">Buckets</label>
@@ -78,7 +74,7 @@
     </div>
     <div class="gf-form-inline">
       <div class="gf-form">
-        <label class="gf-form-label width-5">X Axis</label>
+        <label class="gf-form-label width-4">X Axis</label>
       </div>
       <div class="gf-form">
         <label class="gf-form-label width-5">Buckets</label>