diff --git a/public/app/plugins/datasource/opentsdb/partials/config.html b/public/app/plugins/datasource/opentsdb/partials/config.html
index d212b31686d..f4f0bedfc19 100644
--- a/public/app/plugins/datasource/opentsdb/partials/config.html
+++ b/public/app/plugins/datasource/opentsdb/partials/config.html
@@ -2,14 +2,12 @@
 
 <br>
 <h5>Opentsdb settings</h5>
-<div class="tight-form last">
-  <ul class="tight-form-list">
-    <li class="tight-form-item" style="width: 80px">
-      Version
-    </li>
-    <li class="tight-form-item">
-      <select class="input-medium tight-form-input" ng-model="ctrl.current.jsonData.tsdbVersion" ng-options="v.value as v.name for v in ctrl.tsdbVersions"></select>
-    </li>
-  </ul>
+<div class="gf-form">
+  <span class="gf-form-label width-7">
+    Version
+  </span>
+  <span class="gf-form-select-wrapper">
+    <select class="gf-form-input gf-size-auto" ng-model="ctrl.current.jsonData.tsdbVersion" ng-options="v.value as v.name for v in ctrl.tsdbVersions"></select>
+  </span>
   <div class="clearfix"></div>
 </div>