diff --git a/client/app/visualizations/chart/chart-editor.html b/client/app/visualizations/chart/chart-editor.html
index 34f21e37fe..202b92f0a9 100644
--- a/client/app/visualizations/chart/chart-editor.html
+++ b/client/app/visualizations/chart/chart-editor.html
@@ -168,9 +168,9 @@
     <div class="form-group">
       <label class="control-label">Scale</label>
       <ui-select ng-model="options.xAxis.type">
-        <ui-select-match placeholder="Choose Scale...">{{$select.selected | capitalize}}</ui-select-match>
-        <ui-select-choices repeat="scaleType in xAxisScales">
-          <div ng-bind-html="scaleType | capitalize | highlight: $select.search"></div>
+        <ui-select-match placeholder="Choose Scale...">{{$select.selected.label}}</ui-select-match>
+        <ui-select-choices repeat="scaleType.value as scaleType in xAxisScales">
+          <div ng-bind-html="scaleType.label | highlight: $select.search"></div>
         </ui-select-choices>
       </ui-select>
     </div>
diff --git a/client/app/visualizations/chart/index.js b/client/app/visualizations/chart/index.js
index 07f417b10a..0ab8bbe284 100644
--- a/client/app/visualizations/chart/index.js
+++ b/client/app/visualizations/chart/index.js
@@ -10,7 +10,7 @@ const DEFAULT_OPTIONS = {
   sortX: true,
   legend: { enabled: true },
   yAxis: [{ type: 'linear' }, { type: 'linear', opposite: true }],
-  xAxis: { type: 'datetime', labels: { enabled: true } },
+  xAxis: { type: '-', labels: { enabled: true } },
   error_y: { type: 'data', visible: true },
   series: { stacking: null, error_y: { type: 'data', visible: true } },
   seriesOptions: {},
@@ -103,7 +103,13 @@ function ChartEditor(ColorPalette, clientConfig) {
         scope.chartTypes.custom = { name: 'Custom', icon: 'code' };
       }
 
-      scope.xAxisScales = ['datetime', 'linear', 'logarithmic', 'category'];
+      scope.xAxisScales = [
+        { label: 'Auto Detect', value: '-' },
+        { label: 'Datetime', value: 'datetime' },
+        { label: 'Linear', value: 'linear' },
+        { label: 'Logarithmic', value: 'logarithmic' },
+        { label: 'Category', value: 'category' },
+      ];
       scope.yAxisScales = ['linear', 'logarithmic', 'datetime', 'category'];
 
       scope.chartTypeChanged = () => {