diff --git a/PROGRESS.md b/PROGRESS.md
index 94d8767..b7fdaa1 100644
--- a/PROGRESS.md
+++ b/PROGRESS.md
@@ -103,7 +103,7 @@ On-site editing overlay for admins: browse the real shop with a sidebar for them
 
 | # | Task | Est | Status |
 |---|---|---|---|
-| 1 | Fix double radio button dots in theme editor | 30m | planned |
+| 1 | Fix double radio button dots in theme editor | 30m | done |
 
 ### Platform site
 
diff --git a/assets/css/admin/components.css b/assets/css/admin/components.css
index 0859d2b..e37a091 100644
--- a/assets/css/admin/components.css
+++ b/assets/css/admin/components.css
@@ -4024,7 +4024,14 @@
 }
 
 /* Radio card selector (logo mode picker) */
+.theme-radio-fieldset {
+  border: none;
+  padding: 0;
+  margin: 0;
+}
+
 .theme-radio-card {
+  position: relative;
   display: flex;
   align-items: center;
   gap: 0.75rem;
@@ -4037,6 +4044,17 @@
   &:hover {
     border-color: var(--admin-text-ghost);
   }
+
+  &:has(:focus-visible) {
+    outline: 2px solid var(--t-accent);
+    outline-offset: 2px;
+  }
+}
+
+.theme-radio-input {
+  position: absolute;
+  opacity: 0;
+  pointer-events: none;
 }
 
 .theme-radio-card-active {
diff --git a/lib/berrypod_web/live/admin/theme/index.html.heex b/lib/berrypod_web/live/admin/theme/index.html.heex
index e6cd93b..9d61f38 100644
--- a/lib/berrypod_web/live/admin/theme/index.html.heex
+++ b/lib/berrypod_web/live/admin/theme/index.html.heex
@@ -90,52 +90,51 @@
       
 <!-- Branding Section -->
       <div class="theme-panel">
-        <label class="theme-section-label">Logo & header</label>
-        
-<!-- Logo Mode Radio Cards -->
-        <div class="admin-stack admin-stack-sm theme-field">
-          <%= for {value, title, desc} <- [
-            {"text-only", "Shop name only", "Your name in the heading font"},
-            {"logo-text", "Logo + shop name", "Your logo image with name beside it"},
-            {"logo-only", "Logo only", "Just your logo (with text built in)"}
-          ] do %>
-            <label class={[
-              "theme-radio-card",
-              if(@theme_settings.logo_mode == value,
-                do: "theme-radio-card-active",
-                else: ""
-              )
-            ]}>
-              <input
-                type="radio"
-                name="logo_mode"
-                value={value}
-                checked={@theme_settings.logo_mode == value}
-                phx-click="update_setting"
-                phx-value-field="logo_mode"
-                phx-value-setting_value={value}
-                class="hidden"
-              />
-              <span class={[
-                "theme-radio-dot",
-                @theme_settings.logo_mode == value && "theme-radio-dot-active"
+        <fieldset class="theme-radio-fieldset">
+          <legend class="theme-section-label">Logo & header</legend>
+
+          <div class="admin-stack admin-stack-sm theme-field">
+            <%= for {value, title, desc} <- [
+              {"text-only", "Shop name only", "Your name in the heading font"},
+              {"logo-text", "Logo + shop name", "Your logo image with name beside it"},
+              {"logo-only", "Logo only", "Just your logo (with text built in)"}
+            ] do %>
+              <label class={[
+                "theme-radio-card",
+                @theme_settings.logo_mode == value && "theme-radio-card-active"
               ]}>
-                <span class={[
-                  "theme-radio-dot-inner",
-                  if(@theme_settings.logo_mode == value,
-                    do: "theme-radio-dot-inner-active",
-                    else: ""
-                  )
-                ]}>
+                <input
+                  type="radio"
+                  id={"logo-mode-#{value}"}
+                  name="logo_mode"
+                  value={value}
+                  checked={@theme_settings.logo_mode == value}
+                  phx-click="update_setting"
+                  phx-value-field="logo_mode"
+                  phx-value-setting_value={value}
+                  class="theme-radio-input"
+                />
+                <span
+                  class={[
+                    "theme-radio-dot",
+                    @theme_settings.logo_mode == value && "theme-radio-dot-active"
+                  ]}
+                  aria-hidden="true"
+                >
+                  <span class={[
+                    "theme-radio-dot-inner",
+                    @theme_settings.logo_mode == value && "theme-radio-dot-inner-active"
+                  ]}>
+                  </span>
                 </span>
-              </span>
-              <div class="admin-fill">
-                <div class="theme-radio-title">{title}</div>
-                <div class="admin-text-secondary">{desc}</div>
-              </div>
-            </label>
-          <% end %>
-        </div>
+                <div class="admin-fill">
+                  <div class="theme-radio-title">{title}</div>
+                  <div class="admin-text-secondary">{desc}</div>
+                </div>
+              </label>
+            <% end %>
+          </div>
+        </fieldset>
         
 <!-- Logo Upload (for logo-text and logo-only modes) -->
         <%= if @theme_settings.logo_mode in ["logo-text", "logo-only"] do %>