diff --git a/src/app/projects/[projectId]/components/chatForm/ChatInput.tsx b/src/app/projects/[projectId]/components/chatForm/ChatInput.tsx
index 7485dc4..e707fd4 100644
--- a/src/app/projects/[projectId]/components/chatForm/ChatInput.tsx
+++ b/src/app/projects/[projectId]/components/chatForm/ChatInput.tsx
@@ -63,7 +63,7 @@ export const ChatInput: FC<ChatInputProps> = ({
     // IMEで変換中の場合は送信しない
     if (e.key === "Enter" && !e.nativeEvent.isComposing) {
       const isEnterSend = config?.enterKeyBehavior === "enter-send";
-      
+
       if (isEnterSend && !e.shiftKey) {
         // Enter: Send mode
         e.preventDefault();
diff --git a/src/components/SettingsControls.tsx b/src/components/SettingsControls.tsx
index b177f04..c433d8e 100644
--- a/src/components/SettingsControls.tsx
+++ b/src/components/SettingsControls.tsx
@@ -27,6 +27,7 @@ export const SettingsControls: FC<SettingsControlsProps> = ({
   className = "",
 }: SettingsControlsProps) => {
   const checkboxId = useId();
+  const enterKeyBehaviorId = useId();
   const { config, updateConfig } = useConfig();
   const queryClient = useQueryClient();
 
@@ -116,16 +117,24 @@ export const SettingsControls: FC<SettingsControlsProps> = ({
 
       <div className="space-y-2">
         {showLabels && (
-          <label className="text-sm font-medium leading-none">
+          <label
+            htmlFor={enterKeyBehaviorId}
+            className="text-sm font-medium leading-none"
+          >
             Enter Key Behavior
           </label>
         )}
-        <Select value={config?.enterKeyBehavior || "shift-enter-send"} onValueChange={handleEnterKeyBehaviorChange}>
-          <SelectTrigger className="w-full">
+        <Select
+          value={config?.enterKeyBehavior || "shift-enter-send"}
+          onValueChange={handleEnterKeyBehaviorChange}
+        >
+          <SelectTrigger id={enterKeyBehaviorId} className="w-full">
             <SelectValue placeholder="Select enter key behavior" />
           </SelectTrigger>
           <SelectContent>
-            <SelectItem value="shift-enter-send">Shift+Enter to send (default)</SelectItem>
+            <SelectItem value="shift-enter-send">
+              Shift+Enter to send (default)
+            </SelectItem>
             <SelectItem value="enter-send">Enter to send</SelectItem>
           </SelectContent>
         </Select>
diff --git a/src/server/config/config.ts b/src/server/config/config.ts
index 4845c82..40087f1 100644
--- a/src/server/config/config.ts
+++ b/src/server/config/config.ts
@@ -3,7 +3,10 @@ import z from "zod";
 export const configSchema = z.object({
   hideNoUserMessageSession: z.boolean().optional().default(true),
   unifySameTitleSession: z.boolean().optional().default(true),
-  enterKeyBehavior: z.enum(["shift-enter-send", "enter-send"]).optional().default("shift-enter-send"),
+  enterKeyBehavior: z
+    .enum(["shift-enter-send", "enter-send"])
+    .optional()
+    .default("shift-enter-send"),
 });
 
 export type Config = z.infer<typeof configSchema>;