diff --git a/client/components/Layout.tsx b/client/components/Layout.tsx
index 7c687479..d495d52b 100644
--- a/client/components/Layout.tsx
+++ b/client/components/Layout.tsx
@@ -696,6 +696,12 @@ export default function CodeLayout({ children, hideFooter }: LayoutProps) {
       {/* Supabase Configuration Status */}
       <SupabaseStatus />
 
+      {/* Arm Selector Modal - Rendered at root level */}
+      <ArmSwitcherModal
+        isOpen={isArmModalOpen}
+        onClose={() => setIsArmModalOpen(false)}
+      />
+
       <style>{`
         @keyframes spin {
           from {