diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1af1dd928..fceac8935 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ and this project adheres to
 - 🔒️(backend) sign lobby participant id
 - 🐛(frontend) omit the default speaker id sent to LiveKit
 - 🐛(frontend) play the speaker test when no output is picked
+- 🐛(frontend) keep the admin panel in place when changing a setting #1804
 
 ## [1.34.0] - 2026-10-07
 
diff --git a/src/frontend/src/primitives/Radio.tsx b/src/frontend/src/primitives/Radio.tsx
index a7cbdd36e..3c01c8733 100644
--- a/src/frontend/src/primitives/Radio.tsx
+++ b/src/frontend/src/primitives/Radio.tsx
@@ -9,6 +9,8 @@ import { type StyledVariantProps } from '@/styled-system/types'
 const StyledRadio = styled(RACRadio, {
   base: {
     display: 'flex',
+    // anchor the visually hidden input, so it scrolls with the radio
+    position: 'relative',
     alignItems: 'center',
     gap: 0.375,
     forcedColorAdjust: 'none',
diff --git a/src/frontend/src/primitives/Switch.tsx b/src/frontend/src/primitives/Switch.tsx
index 8713be28e..d2a44bd9c 100644
--- a/src/frontend/src/primitives/Switch.tsx
+++ b/src/frontend/src/primitives/Switch.tsx
@@ -9,6 +9,8 @@ import { RiCheckLine, RiCloseFill } from '@remixicon/react'
 const StyledSwitch = styled(RACSwitch, {
   base: {
     display: 'flex',
+    // anchor the visually hidden input, so it scrolls with the switch
+    position: 'relative',
     alignItems: 'center',
     gap: '0.571rem',
     color: 'black',