diff --git a/public/app/plugins/panel/table/column_options.html b/public/app/plugins/panel/table/column_options.html
index 53e3c477346..b729a289970 100644
--- a/public/app/plugins/panel/table/column_options.html
+++ b/public/app/plugins/panel/table/column_options.html
@@ -35,13 +35,15 @@
 
       <div class="gf-form">
         <label class="gf-form-label width-11">Type</label>
-        <div class="gf-form-select-wrapper width-10">
+        <div class="gf-form-select-wrapper width-16">
           <select class="gf-form-input" ng-model="style.type" ng-options="c.value as c.text for c in editor.columnTypes" ng-change="editor.render()"></select>
         </div>
       </div>
       <div class="gf-form"  ng-if="style.type === 'date'">
         <label class="gf-form-label width-11">Date Format</label>
-        <metric-segment-model property="style.dateFormat" options="editor.dateFormats" on-change="editor.render()" custom="true"></metric-segment-model>
+        <div class="gf-form-select-wrapper width-16">
+          <select class="gf-form-input" ng-model="style.dateFormat" ng-options="c.value as c.text for c in editor.dateFormats" ng-change="editor.render()"></select>
+        </div>
       </div>
 
       <div ng-if="style.type === 'string'">
@@ -54,7 +56,7 @@
       <div ng-if="style.type === 'number'">
         <div class="gf-form">
           <label class="gf-form-label width-11">Unit</label>
-          <div class="gf-form-dropdown-typeahead width-10" ng-model="style.unit" dropdown-typeahead2="editor.unitFormats" dropdown-typeahead-on-select="editor.setUnitFormat(style, $subItem)"></div>
+          <div class="gf-form-dropdown-typeahead width-16" ng-model="style.unit" dropdown-typeahead2="editor.unitFormats" dropdown-typeahead-on-select="editor.setUnitFormat(style, $subItem)"></div>
         </div>
         <div class="gf-form">
           <label class="gf-form-label width-11">Decimals</label>