diff --git a/frontend/src/features/admin/shows/ShowMetadataCard.tsx b/frontend/src/features/admin/shows/ShowMetadataCard.tsx
index 2d86c55..962ca89 100644
--- a/frontend/src/features/admin/shows/ShowMetadataCard.tsx
+++ b/frontend/src/features/admin/shows/ShowMetadataCard.tsx
@@ -85,7 +85,6 @@ export function ShowMetadataCard({ show, onChanged }: { show: ShowDto; onChanged
     },
     onSuccess: () => {
       toast.success(t('settings.saved'))
-      setQuery(originalName.trim() || show.name)
       changed()
     },
     onError,
@@ -131,7 +130,7 @@ export function ShowMetadataCard({ show, onChanged }: { show: ShowDto; onChanged
             )}
           </div>
           <Button size="sm" variant="outline" onClick={() => setGalleryOpen(true)}>
-            {t('admin.metadata.pickFromGallery')}
+            {t('admin.metadata.pickPoster')}
           </Button>
           <ImageGallery
             open={galleryOpen}
@@ -156,35 +155,15 @@ export function ShowMetadataCard({ show, onChanged }: { show: ShowDto; onChanged
 
           {providers && providers.length > 0 && (
             <div className="flex flex-col gap-2">
-              <div className="flex flex-wrap items-end gap-2">
-                <div className="flex flex-col gap-1.5">
-                  <Label>{t('admin.metadata.source')}</Label>
-                  <Select value={effectiveProvider} onValueChange={setProvider}>
-                    <SelectTrigger className="w-28">
-                      <SelectValue />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {providers.map((p) => (
-                        <SelectItem key={p} value={p}>
-                          {p.toUpperCase()}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </div>
-                <Input
-                  className="min-w-40 flex-1"
-                  value={query}
-                  onChange={(e) => {
-                    setQuery(e.target.value)
-                    setSearched(false)
-                  }}
-                  placeholder={t('admin.metadata.searchPlaceholder')}
-                />
-                <Button size="sm" disabled={search.isPending || !query.trim()} onClick={() => search.mutate()}>
-                  {t('admin.metadata.searchBtn')}
-                </Button>
-              </div>
+              <Label>{t('admin.metadata.searchLabel')}</Label>
+              <Input
+                value={query}
+                onChange={(e) => {
+                  setQuery(e.target.value)
+                  setSearched(false)
+                }}
+                placeholder={t('admin.metadata.searchPlaceholder')}
+              />
 
               {searched && results.length === 0 && (
                 <p className="text-xs text-muted-foreground">{t('admin.metadata.nothingFound')}</p>
@@ -245,6 +224,30 @@ export function ShowMetadataCard({ show, onChanged }: { show: ShowDto; onChanged
               </div>
             </div>
             <div className="flex flex-wrap items-center gap-2">
+              {providers && providers.length > 0 && (
+                <>
+                  <Select value={effectiveProvider} onValueChange={setProvider}>
+                    <SelectTrigger className="h-9 w-24">
+                      <SelectValue />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {providers.map((p) => (
+                        <SelectItem key={p} value={p}>
+                          {p.toUpperCase()}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                  <Button
+                    size="sm"
+                    variant="outline"
+                    disabled={search.isPending || !query.trim()}
+                    onClick={() => search.mutate()}
+                  >
+                    {t('admin.metadata.searchBtn')}
+                  </Button>
+                </>
+              )}
               <Button size="sm" disabled={save.isPending} onClick={() => save.mutate()}>
                 {t('common.save')}
               </Button>
diff --git a/frontend/src/shared/lib/i18n.ts b/frontend/src/shared/lib/i18n.ts
index e006c32..735e6b5 100644
--- a/frontend/src/shared/lib/i18n.ts
+++ b/frontend/src/shared/lib/i18n.ts
@@ -284,6 +284,8 @@ const resources = {
         metadata: {
           title: 'Метаданные',
           pickFromGallery: 'Выбрать из галереи',
+          pickPoster: 'Из галереи',
+          searchLabel: 'Поиск метаданных',
           originalName: 'Оригинальное название (eng)',
           originalNamePlaceholder: 'Например: Family Guy',
           originalNameHint: 'По нему ищутся метаданные; на экранах показывается обычное название.',
@@ -588,6 +590,8 @@ const resources = {
         metadata: {
           title: 'Metadata',
           pickFromGallery: 'Pick from gallery',
+          pickPoster: 'From gallery',
+          searchLabel: 'Metadata search',
           originalName: 'Original name (eng)',
           originalNamePlaceholder: 'e.g. Family Guy',
           originalNameHint: 'Metadata is looked up by this; screens still show the regular name.',