diff --git a/superset/assets/javascripts/explorev2/components/ChartContainer.jsx b/superset/assets/javascripts/explorev2/components/ChartContainer.jsx
index 86f361e7d73..18a5cc63aec 100644
--- a/superset/assets/javascripts/explorev2/components/ChartContainer.jsx
+++ b/superset/assets/javascripts/explorev2/components/ChartContainer.jsx
@@ -25,6 +25,7 @@ const propTypes = {
   isChartLoading: PropTypes.bool,
   isStarred: PropTypes.bool.isRequired,
   alert: PropTypes.string,
+  table_name: PropTypes.string,
 };
 
 class ChartContainer extends React.Component {
@@ -133,6 +134,16 @@ class ChartContainer extends React.Component {
     visMap[this.props.viz_type](this.state.mockSlice).render();
   }
 
+  renderChartTitle() {
+    let title;
+    if (this.props.slice_name) {
+      title = this.props.slice_name;
+    } else {
+      title = `[${this.props.table_name}] - untitled`;
+    }
+    return title;
+  }
+
   render() {
     return (
       <div className="chart-container">
@@ -143,27 +154,29 @@ class ChartContainer extends React.Component {
               id="slice-header"
               className="clearfix panel-title-large"
             >
-              <div className="pull-left">
-                {this.props.slice_name}
+              {this.renderChartTitle()}
 
-                <FaveStar
-                  sliceId={this.props.slice_id}
-                  actions={this.props.actions}
-                  isStarred={this.props.isStarred}
-                />
+              {this.props.slice_id &&
+                <span>
+                  <FaveStar
+                    sliceId={this.props.slice_id}
+                    actions={this.props.actions}
+                    isStarred={this.props.isStarred}
+                  />
 
-                <TooltipWrapper
-                  label="edit-desc"
-                  tooltip="Edit Description"
-                >
-                  <a
-                    className="edit-desc-icon"
-                    href={`/slicemodelview/edit/${this.props.slice_id}`}
+                  <TooltipWrapper
+                    label="edit-desc"
+                    tooltip="Edit Description"
                   >
-                    <i className="fa fa-edit" />
-                  </a>
-                </TooltipWrapper>
-              </div>
+                    <a
+                      className="edit-desc-icon"
+                      href={`/slicemodelview/edit/${this.props.slice_id}`}
+                    >
+                      <i className="fa fa-edit" />
+                    </a>
+                  </TooltipWrapper>
+                </span>
+              }
 
               <div className="pull-right">
                 <ExploreActionButtons
@@ -217,6 +230,7 @@ function mapStateToProps(state) {
     isChartLoading: state.isChartLoading,
     isStarred: state.isStarred,
     alert: state.chartAlert,
+    table_name: state.viz.form_data.datasource_name,
   };
 }
 
diff --git a/superset/templates/superset/explorev2.html b/superset/templates/superset/explorev2.html
index 9dd5564e664..ae52fd347fb 100644
--- a/superset/templates/superset/explorev2.html
+++ b/superset/templates/superset/explorev2.html
@@ -1,8 +1,8 @@
 {% extends "superset/basic.html" %}
 
 {% block title %}
-  {% if slice_name %}
-    [slice] {{ slice_name }}
+  {% if slc %}
+    [slice] {{ slc.slice_name }}
   {% else %}
     [explore] {{ table_name }}
   {% endif %}
diff --git a/superset/views.py b/superset/views.py
index 70d4c0a72cd..a0abda93b67 100755
--- a/superset/views.py
+++ b/superset/views.py
@@ -1454,7 +1454,7 @@ class Superset(BaseSupersetView):
             return self.render_template(
                 "superset/explorev2.html",
                 bootstrap_data=json.dumps(bootstrap_data),
-                slice_name=slc.slice_name,
+                slice=slc,
                 table_name=viz_obj.datasource.table_name)
         else:
             return self.render_template(