diff --git a/frontend/src/metabase/core/components/SelectButton/SelectButton.tsx b/frontend/src/metabase/core/components/SelectButton/SelectButton.tsx
index e4cb69064f6325b13b10fa350785bb263283da42..a589aaebce3f887ec651eb702470ac2b31c1fb11 100644
--- a/frontend/src/metabase/core/components/SelectButton/SelectButton.tsx
+++ b/frontend/src/metabase/core/components/SelectButton/SelectButton.tsx
@@ -82,6 +82,7 @@ const SelectButton = forwardRef(function SelectButton(
         hasValue={hasValue}
         highlighted={highlighted}
         onClick={rightIcon === "close" ? handleClear : undefined}
+        style={{ flexShrink: 0 }}
       />
     </SelectButtonRoot>
   );
diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.tsx
index 5d1be4ba2aa5d531b79327474ba3478b2a91de99..78ea86ee6821135d78797eba600819dc1d3fd52e 100644
--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.tsx
+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.tsx
@@ -63,7 +63,7 @@ const ValuesSourceModal = ({
       sourceConfig={sourceConfig}
       onChangeSourceConfig={setSourceConfig}
       onSubmit={handlePickerClose}
-      onClose={onClose}
+      onClose={handlePickerClose}
     />
   );
 };