diff --git a/superset/assets/javascripts/dashboard/components/SliceAdder.jsx b/superset/assets/javascripts/dashboard/components/SliceAdder.jsx
index a96effef4b..cb9206619e 100644
--- a/superset/assets/javascripts/dashboard/components/SliceAdder.jsx
+++ b/superset/assets/javascripts/dashboard/components/SliceAdder.jsx
@@ -129,9 +129,14 @@ class SliceAdder extends React.Component {
             height="auto"
           >
             <TableHeaderColumn
-              dataField="sliceName"
+              dataField="id"
               isKey
               dataSort
+              hidden
+            />
+            <TableHeaderColumn
+              dataField="sliceName"
+              dataSort
             >
               Name
             </TableHeaderColumn>
diff --git a/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx b/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
index 8a2e52819d..e3b29855a8 100644
--- a/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
+++ b/superset/assets/javascripts/explore/components/ControlPanelsContainer.jsx
@@ -74,6 +74,7 @@ class ControlPanelsContainer extends React.Component {
                   key={`controlsetrow-${i}`}
                   controls={controlSets.map(controlName => (
                     controlName &&
+                    this.props.controls[controlName] &&
                       <Control
                         name={controlName}
                         key={`control-${controlName}`}