diff --git a/superset/assets/src/dashboard/components/Header.jsx b/superset/assets/src/dashboard/components/Header.jsx
index 489d16cf60e2c..4542f9a4b214e 100644
--- a/superset/assets/src/dashboard/components/Header.jsx
+++ b/superset/assets/src/dashboard/components/Header.jsx
@@ -431,11 +431,13 @@ class Header extends React.PureComponent {
                   metadata: JSON.parse(updates.jsonMetadata),
                 });
                 this.props.dashboardTitleChanged(updates.title);
-                history.pushState(
-                  { event: 'dashboard_properties_changed' },
-                  '',
-                  `/superset/dashboard/${updates.slug}/`,
-                );
+                if (updates.slug) {
+                  history.pushState(
+                    { event: 'dashboard_properties_changed' },
+                    '',
+                    `/superset/dashboard/${updates.slug}/`,
+                  );
+                }
               }}
             />
           )}
diff --git a/superset/assets/src/dashboard/components/PropertiesModal.jsx b/superset/assets/src/dashboard/components/PropertiesModal.jsx
index 916bdeafbd7d7..9b2fffe479e6d 100644
--- a/superset/assets/src/dashboard/components/PropertiesModal.jsx
+++ b/superset/assets/src/dashboard/components/PropertiesModal.jsx
@@ -52,10 +52,10 @@ class PropertiesModal extends React.PureComponent {
     this.state = {
       errors: [],
       values: {
-        dashboard_title: this.props.dashboardTitle,
-        slug: this.props.dashboardInfo.slug,
-        owners: this.props.owners || [],
-        json_metadata: JSON.stringify(this.props.dashboardInfo.metadata),
+        dashboard_title: props.dashboardTitle,
+        slug: props.dashboardInfo.slug,
+        owners: props.owners || [],
+        json_metadata: JSON.stringify(props.dashboardInfo.metadata),
       },
       isOwnersLoaded: false,
       userOptions: null,
@@ -189,7 +189,7 @@ class PropertiesModal extends React.PureComponent {
                   name="slug"
                   type="text"
                   bsSize="sm"
-                  value={values.slug}
+                  value={values.slug || ''}
                   onChange={this.onChange}
                 />
                 <p className="help-block">