diff --git a/apps/web/src/components/settings/SettingsPanels.tsx b/apps/web/src/components/settings/SettingsPanels.tsx
index ef9084dd3c5059004ec82423b0298aa2e7bf9508..9de7946eac6a4bc5963de7a56071c903f27d919a 100644
--- a/apps/web/src/components/settings/SettingsPanels.tsx
+++ b/apps/web/src/components/settings/SettingsPanels.tsx
@@ -105,7 +105,6 @@ import {
   AlertDialogTitle,
 } from "../ui/alert-dialog";
 import { Button } from "../ui/button";
-import { Toggle, ToggleGroup } from "../ui/toggle-group";
 import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from "../ui/collapsible";
 import {
   Dialog,
@@ -2673,23 +2672,24 @@ export function GeneralSettingsPanel() {
             ) : null
           }
           control={
-            <ToggleGroup
-              aria-label="Follow-up behavior"
-              variant="default"
-              value={[settings.followUpBehavior]}
-              onValueChange={(values) => {
-                const value = values[0];
+            <Select
+              value={settings.followUpBehavior}
+              onValueChange={(value) => {
                 if (value === "queue" || value === "steer") {
                   updateSettings({ followUpBehavior: value });
                 }
               }}
             >
-              {(["queue", "steer"] as const).map((value) => (
-                <Toggle key={value} value={value} variant="pill">
-                  {value === "queue" ? "Queue" : "Steer"}
-                </Toggle>
-              ))}
-            </ToggleGroup>
+              <SelectTrigger size="sm" className="w-auto min-w-0" aria-label="Follow-up behavior">
+                <SelectValue>
+                  {settings.followUpBehavior === "queue" ? "Queue" : "Steer"}
+                </SelectValue>
+              </SelectTrigger>
+              <SelectPopup align="end" alignItemWithTrigger={false}>
+                <SelectItem value="queue">Queue</SelectItem>
+                <SelectItem value="steer">Steer</SelectItem>
+              </SelectPopup>
+            </Select>
           }
         />
 
@@ -3188,7 +3188,7 @@ export function GeneralSettingsPanel() {
           control={
             <Button
               render={<Link to="/settings/open-source-licenses" />}
-              size="xs"
+              size="sm"
               variant="outline"
             >
               View licenses