diff --git a/src/client/components/play/MetadataResults.tsx b/src/client/components/play/MetadataResults.tsx
index a6b8d721..b92ff350 100644
--- a/src/client/components/play/MetadataResults.tsx
+++ b/src/client/components/play/MetadataResults.tsx
@@ -117,7 +117,7 @@ export const MetadataSearchCombobox = <T extends MetadataSearchResult>(props: Me
         }
     };
 
-    const inputElm = <Combobox.Input placeholder={placeholder} />;
+    const inputElm = <Combobox.Input placeholder={placeholder} paddingInlineEnd={onInputSwitch === undefined ? undefined : 'calc(var(--combobox-input-height) * 2)'} />;
     let input: React.JSX.Element;
     if(props.inputGroupContent !== undefined) {
         input = (
diff --git a/src/client/components/play/PlayEdit.tsx b/src/client/components/play/PlayEdit.tsx
index b3d4cfa8..ef71f797 100644
--- a/src/client/components/play/PlayEdit.tsx
+++ b/src/client/components/play/PlayEdit.tsx
@@ -132,7 +132,7 @@ export const PlayEdit = (props: PlayEditProps) => {
 
     // track artists and album artists are edited the same way, album artists can be empty
     const artistsField = (name: 'data.artists' | 'data.albumArtists', legend: string, minRows: number) => (
-        <Fieldset.Root size="md">
+        <Fieldset.Root size="md" minW="0">
             <Fieldset.Legend>{legend}</Fieldset.Legend>
             <Fieldset.Content mt="2">
                 <form.ArrayField key={artistsVersion} name={name}>