diff --git a/superset-frontend/src/explore/components/PropertiesModal.tsx b/superset-frontend/src/explore/components/PropertiesModal.tsx
index f49dab0568d3a..0cb598888516c 100644
--- a/superset-frontend/src/explore/components/PropertiesModal.tsx
+++ b/superset-frontend/src/explore/components/PropertiesModal.tsx
@@ -262,18 +262,18 @@ function PropertiesModal({ slice, onHide, onSave }: InternalProps) {
         </Row>
       </Modal.Body>
       <Modal.Footer>
+        <Button type="button" bsSize="sm" onClick={onHide}>
+          {t('Cancel')}
+        </Button>
         <Button
           type="submit"
           bsSize="sm"
           bsStyle="primary"
           className="m-r-5"
-          disabled={!owners || submitting}
+          disabled={!owners || submitting || !name}
         >
           {t('Save')}
         </Button>
-        <Button type="button" bsSize="sm" onClick={onHide}>
-          {t('Cancel')}
-        </Button>
         <Dialog ref={errorDialog} />
       </Modal.Footer>
     </form>
diff --git a/superset-frontend/src/explore/components/SaveModal.jsx b/superset-frontend/src/explore/components/SaveModal.jsx
index 4ac1a79ddb3be..45b96ffd5160d 100644
--- a/superset-frontend/src/explore/components/SaveModal.jsx
+++ b/superset-frontend/src/explore/components/SaveModal.jsx
@@ -25,10 +25,10 @@ import {
   Button,
   FormControl,
   FormGroup,
-  ControlLabel,
   Modal,
   Radio,
 } from 'react-bootstrap';
+import FormLabel from 'src/components/FormLabel';
 import { CreatableSelect } from 'src/components/Select/SupersetStyledSelect';
 import { t } from '@superset-ui/translation';
 import ReactMarkdown from 'react-markdown';
@@ -176,7 +176,7 @@ class SaveModal extends React.Component {
           </FormGroup>
           <hr />
           <FormGroup>
-            <ControlLabel>{t('Chart name')}</ControlLabel>
+            <FormLabel required>{t('Chart name')}</FormLabel>
             <FormControl
               name="new_slice_name"
               type="text"
@@ -187,7 +187,7 @@ class SaveModal extends React.Component {
             />
           </FormGroup>
           <FormGroup>
-            <ControlLabel>{t('Add to dashboard')}</ControlLabel>
+            <FormLabel required>{t('Add to dashboard')}</FormLabel>
             <CreatableSelect
               id="dashboard-creatable-select"
               className="save-modal-selector"
@@ -224,7 +224,11 @@ class SaveModal extends React.Component {
               type="button"
               id="btn_modal_save_goto_dash"
               bsSize="sm"
-              disabled={canNotSaveToDash || !this.state.newDashboardName}
+              disabled={
+                canNotSaveToDash ||
+                !this.state.newSliceName ||
+                !this.state.newDashboardName
+              }
               onClick={this.saveOrOverwrite.bind(this, true)}
             >
               {t('Save & go to dashboard')}
@@ -235,6 +239,7 @@ class SaveModal extends React.Component {
               bsSize="sm"
               bsStyle="primary"
               onClick={this.saveOrOverwrite.bind(this, false)}
+              disabled={!this.state.newSliceName}
             >
               {t('Save')}
             </Button>