diff --git a/superset/assets/javascripts/explore/stores/visTypes.js b/superset/assets/javascripts/explore/stores/visTypes.js
index 3f515847d673f..425c674e4654d 100644
--- a/superset/assets/javascripts/explore/stores/visTypes.js
+++ b/superset/assets/javascripts/explore/stores/visTypes.js
@@ -156,25 +156,14 @@ export const visTypes = {
 
   line_xy: {
     label: t('XY - Line Chart'),
+    showOnExplore: true,
     controlPanelSections: [
-      {
-        label: t('Axis Options'),
-        description: t('Select which columns or metrics to plot'),
-        expanded: true,
-        controlSetRows: [
-          ['columns_and_metrics_x'],
-          ['columns_and_metrics_y'],
-          ['slice_by'],
-        ],
-      },
       {
         label: t('GROUP BY'),
         description: t('Use this section if you want a query that aggregates'),
         controlSetRows: [
           ['groupby'],
           ['metrics'],
-          ['limit', 'timeseries_limit_metric'],
-          ['order_desc', null],
         ],
       },
       {
@@ -190,6 +179,16 @@ export const visTypes = {
           ['row_limit'],
         ],
       },
+      {
+        label: t('Axis Options'),
+        description: t('Select which columns or metrics from the query to plot'),
+        expanded: true,
+        controlSetRows: [
+          ['columns_and_metrics_x'],
+          ['columns_and_metrics_y'],
+          ['slice_by'],
+        ],
+      },
       {
         label: t('Chart Options'),
         controlSetRows: [
diff --git a/superset/viz.py b/superset/viz.py
index 730907fc99bf3..14d0faf616369 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -907,8 +907,7 @@ class NVD3LineXYViz(NVD3Viz):
 
     viz_type = 'line_xy'
     verbose_name = _('XY Line Chart')
-    sort_series = False
-    is_timeseries = True
+    is_timeseries = False
 
     def query_obj(self):
         d = super(NVD3LineXYViz, self).query_obj()