diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
index 053b0942514c7..fee2eb941ff60 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
@@ -406,7 +406,7 @@ const ColumnSelectPopover = ({
           {t('Close')}
         </Button>
         <Button
-          disabled={stateIsValid && !hasUnsavedChanges}
+          disabled={!stateIsValid || !hasUnsavedChanges}
           buttonStyle="primary"
           buttonSize="small"
           onClick={onSave}
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/AdhocFilterEditPopover.test.jsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/AdhocFilterEditPopover.test.jsx
index 7e05d3ba37c21..3fec073f94660 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/AdhocFilterEditPopover.test.jsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/AdhocFilterEditPopover.test.jsx
@@ -126,7 +126,7 @@ describe('AdhocFilterEditPopover', () => {
     wrapper
       .instance()
       .onAdhocFilterChange(simpleAdhocFilter.duplicateWith({ operator: null }));
-    expect(wrapper.find(Button).find({ disabled: false })).toExist();
+    expect(wrapper.find(Button).find({ disabled: true })).toExist();
     wrapper.instance().onAdhocFilterChange(sqlAdhocFilter);
     expect(wrapper.find(Button).find({ disabled: true })).not.toExist();
   });
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx
index 95c196e39bdb6..fc3d5a3a0183e 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx
@@ -246,7 +246,8 @@ export default class AdhocFilterEditPopover extends React.Component {
           <Button
             data-test="adhoc-filter-edit-popover-save-button"
             disabled={
-              (stateIsValid || !this.state.isSimpleTabValid) &&
+              !stateIsValid ||
+              !this.state.isSimpleTabValid ||
               !hasUnsavedChanges
             }
             buttonStyle="primary"
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.jsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.jsx
index 87f0ce215bec9..5fdd80e9d3f6c 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.jsx
@@ -100,17 +100,18 @@ describe('AdhocMetricEditPopover', () => {
     const { wrapper } = setup();
     expect(wrapper.find(Button).find({ disabled: false })).not.toExist();
     wrapper.instance().onColumnChange(null);
-    expect(wrapper.find(Button).find({ disabled: true })).not.toExist();
+    expect(wrapper.find(Button).find({ disabled: true })).toExist();
     wrapper.instance().onColumnChange(columns[0].column_name);
     expect(wrapper.find(Button).find({ disabled: true })).not.toExist();
     wrapper.instance().onAggregateChange(null);
-    expect(wrapper.find(Button).find({ disabled: true })).not.toExist();
+    expect(wrapper.find(Button).find({ disabled: true })).toExist();
   });
 
   it('highlights save if changes are present', () => {
     const { wrapper } = setup();
+    expect(wrapper.find(Button).find({ disabled: true })).toExist();
     wrapper.instance().onColumnChange(columns[1].column_name);
-    expect(wrapper.find(Button).find({ buttonStyle: 'primary' })).toExist();
+    expect(wrapper.find(Button).find({ disabled: true })).not.toExist();
   });
 
   it('will initiate a drag when clicked', () => {
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.tsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.tsx
index f8ae69aee3d7b..8829d4e283d9f 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.tsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.tsx
@@ -18,7 +18,7 @@
  */
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { render, screen } from 'spec/helpers/testing-library';
+import { render, screen, waitFor, within } from 'spec/helpers/testing-library';
 import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric';
 import AdhocMetricEditPopover from '.';
 
@@ -35,10 +35,15 @@ const createProps = () => ({
   },
   savedMetricsOptions: [
     {
-      id: 65,
+      id: 64,
       metric_name: 'count',
       expression: 'COUNT(*)',
     },
+    {
+      id: 65,
+      metric_name: 'sum',
+      expression: 'sum(num)',
+    },
   ],
   adhocMetric: new AdhocMetric({ isNew: true }),
   datasource: {
@@ -118,18 +123,20 @@ test('Clicking on "Close" should call onClose', () => {
   expect(props.onClose).toBeCalledTimes(1);
 });
 
-test('Clicking on "Save" should call onChange and onClose', () => {
-  const props = {
-    ...createProps(),
-    savedMetric: {},
-  };
+test('Clicking on "Save" should call onChange and onClose', async () => {
+  const props = createProps();
   render(<AdhocMetricEditPopover {...props} />);
   expect(props.onChange).toBeCalledTimes(0);
   expect(props.onClose).toBeCalledTimes(0);
-  const element = screen.getByRole('combobox', {
-    name: 'Select saved metrics',
-  });
-  expect(element).toBeVisible();
+  userEvent.click(
+    screen.getByRole('combobox', {
+      name: 'Select saved metrics',
+    }),
+  );
+  const sumOption = await waitFor(() =>
+    within(document.querySelector('.rc-virtual-list')!).getByText('sum'),
+  );
+  userEvent.click(sumOption);
   userEvent.click(screen.getByRole('button', { name: 'Save' }));
   expect(props.onChange).toBeCalledTimes(1);
   expect(props.onClose).toBeCalledTimes(1);
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
index 877ca19b34d55..f49eb5b4f750c 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
@@ -487,7 +487,7 @@ export default class AdhocMetricEditPopover extends React.PureComponent {
             {t('Close')}
           </Button>
           <Button
-            disabled={stateIsValid && !hasUnsavedChanges}
+            disabled={!stateIsValid || !hasUnsavedChanges}
             buttonStyle="primary"
             buttonSize="small"
             data-test="AdhocMetricEdit#save"