diff --git a/superset/assets/javascripts/dashboard/Dashboard.jsx b/superset/assets/javascripts/dashboard/Dashboard.jsx
index 687910679d9..73348a46212 100644
--- a/superset/assets/javascripts/dashboard/Dashboard.jsx
+++ b/superset/assets/javascripts/dashboard/Dashboard.jsx
@@ -263,7 +263,7 @@ export function dashboardContainer(dashboard) {
       this.sliceObjects.forEach(slice => {
         if (slice.data.slice_id !== sliceId && immune.indexOf(slice.data.slice_id) === -1) {
           slice.render();
-          const sliceSeletor = $(`#${slice.data.token}-cell`);
+          const sliceSeletor = $(`#${slice.data.slice_id}-cell`);
           sliceSeletor.addClass('slice-cell-highlight');
           setTimeout(function () {
             sliceSeletor.removeClass('slice-cell-highlight');
diff --git a/superset/assets/javascripts/dashboard/components/GridLayout.jsx b/superset/assets/javascripts/dashboard/components/GridLayout.jsx
index bfbd7f64b05..0d3a0d919d1 100644
--- a/superset/assets/javascripts/dashboard/components/GridLayout.jsx
+++ b/superset/assets/javascripts/dashboard/components/GridLayout.jsx
@@ -98,7 +98,7 @@ class GridLayout extends React.Component {
             id={'slice_' + slice.slice_id}
             key={slice.slice_id}
             data-slice-id={slice.slice_id}
-            className={`widget ${slice.form_data.viz_type}`}
+            className="widget"
           >
             <SliceCell
               slice={slice}
diff --git a/superset/assets/javascripts/dashboard/components/SliceCell.jsx b/superset/assets/javascripts/dashboard/components/SliceCell.jsx
index 798753def83..36a82ce2197 100644
--- a/superset/assets/javascripts/dashboard/components/SliceCell.jsx
+++ b/superset/assets/javascripts/dashboard/components/SliceCell.jsx
@@ -8,7 +8,7 @@ const propTypes = {
 
 function SliceCell({ expandedSlices, removeSlice, slice }) {
   return (
-    <div className="slice-cell" id={`${slice.token}-cell`}>
+    <div className="slice-cell" id={`${slice.slice_id}-cell`}>
       <div className="chart-header">
         <div className="row">
           <div className="col-md-12 header">
@@ -73,7 +73,11 @@ function SliceCell({ expandedSlices, removeSlice, slice }) {
             className="loading"
             alt="loading"
           />
-          <div className="slice_container" id={'con_' + slice.slice_id}></div>
+          <div
+            id={'con_' + slice.slice_id}
+            className={`slice_container ${slice.form_data.viz_type}`}
+          >
+          </div>
         </div>
       </div>
     </div>