diff --git a/frontend/lib/registry/pop-components/pop-field/PopFieldConfig.tsx b/frontend/lib/registry/pop-components/pop-field/PopFieldConfig.tsx
index 8e0f8ad1..965bccee 100644
--- a/frontend/lib/registry/pop-components/pop-field/PopFieldConfig.tsx
+++ b/frontend/lib/registry/pop-components/pop-field/PopFieldConfig.tsx
@@ -356,7 +356,10 @@ function SaveTabContent({
   };
 
   const syncAndUpdateSaveMappings = useCallback(
-    (updater?: (prev: PopFieldSaveMapping[]) => PopFieldSaveMapping[]) => {
+    (
+      updater?: (prev: PopFieldSaveMapping[]) => PopFieldSaveMapping[],
+      extraPartial?: Partial<PopFieldConfig>,
+    ) => {
       const fieldIds = new Set(allFields.map(({ field }) => field.id));
       const prev = saveMappings.filter((m) => fieldIds.has(m.fieldId));
       const next = updater ? updater(prev) : prev;
@@ -381,6 +384,7 @@ function SaveTabContent({
             tableName: saveTableName,
             fieldMappings: merged,
           },
+          ...extraPartial,
         });
       }
     },
@@ -395,22 +399,27 @@ function SaveTabContent({
 
   const updateSaveMapping = useCallback(
     (fieldId: string, partial: Partial<PopFieldSaveMapping>) => {
-      syncAndUpdateSaveMappings((prev) =>
-        prev.map((m) => (m.fieldId === fieldId ? { ...m, ...partial } : m))
-      );
+      let extraPartial: Partial<PopFieldConfig> | undefined;
 
       if (partial.targetColumn !== undefined) {
         const newFieldName = partial.targetColumn || "";
-        const sections = cfg.sections.map((s) => ({
-          ...s,
-          fields: (s.fields ?? []).map((f) =>
-            f.id === fieldId ? { ...f, fieldName: newFieldName } : f
-          ),
-        }));
-        onUpdateConfig({ sections });
+        extraPartial = {
+          sections: cfg.sections.map((s) => ({
+            ...s,
+            fields: (s.fields ?? []).map((f) =>
+              f.id === fieldId ? { ...f, fieldName: newFieldName } : f
+            ),
+          })),
+        };
       }
+
+      syncAndUpdateSaveMappings(
+        (prev) =>
+          prev.map((m) => (m.fieldId === fieldId ? { ...m, ...partial } : m)),
+        extraPartial,
+      );
     },
-    [syncAndUpdateSaveMappings, cfg, onUpdateConfig]
+    [syncAndUpdateSaveMappings, cfg.sections]
   );
 
   // --- 숨은 필드 매핑 로직 ---
@@ -2086,23 +2095,24 @@ function JsonKeySelect({
   onOpen?: () => void;
 }) {
   const [open, setOpen] = useState(false);
+  const [inputValue, setInputValue] = useState("");
 
   const handleOpenChange = (nextOpen: boolean) => {
     setOpen(nextOpen);
-    if (nextOpen) onOpen?.();
+    if (nextOpen) {
+      onOpen?.();
+      setInputValue("");
+    }
   };
 
-  if (keys.length === 0 && !value) {
-    return (
-      <Input
-        placeholder="키"
-        value={value}
-        onChange={(e) => onValueChange(e.target.value)}
-        onFocus={() => onOpen?.()}
-        className="h-7 w-24 text-xs"
-      />
-    );
-  }
+  const handleInputKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === "Enter" && inputValue.trim()) {
+      e.preventDefault();
+      onValueChange(inputValue.trim());
+      setInputValue("");
+      setOpen(false);
+    }
+  };
 
   return (
     <Popover open={open} onOpenChange={handleOpenChange}>
@@ -2117,33 +2127,51 @@ function JsonKeySelect({
         </Button>
       </PopoverTrigger>
       <PopoverContent className="w-48 p-0" align="start">
-        <Command>
-          <CommandInput placeholder="키 검색..." className="text-xs" />
+        <Command shouldFilter={keys.length > 0}>
+          <CommandInput
+            placeholder={keys.length > 0 ? "키 검색..." : "키 직접 입력..."}
+            className="text-xs"
+            value={inputValue}
+            onValueChange={setInputValue}
+            onKeyDown={handleInputKeyDown}
+          />
           <CommandList>
-            <CommandEmpty className="py-2 text-center text-xs">
-              {keys.length === 0 ? "데이터를 불러오는 중..." : "일치하는 키가 없습니다."}
-            </CommandEmpty>
-            <CommandGroup>
-              {keys.map((k) => (
-                <CommandItem
-                  key={k}
-                  value={k}
-                  onSelect={(v) => {
-                    onValueChange(v === value ? "" : v);
-                    setOpen(false);
-                  }}
-                  className="text-xs"
-                >
-                  <Check
-                    className={cn(
-                      "mr-2 h-3 w-3",
-                      value === k ? "opacity-100" : "opacity-0"
-                    )}
-                  />
-                  {k}
-                </CommandItem>
-              ))}
-            </CommandGroup>
+            {keys.length === 0 ? (
+              <div className="px-3 py-2 text-center text-xs text-muted-foreground">
+                {inputValue.trim()
+                  ? "Enter로 입력 확정"
+                  : "테이블에 데이터가 없습니다. 키를 직접 입력하세요."}
+              </div>
+            ) : (
+              <>
+                <CommandEmpty className="py-2 text-center text-xs">
+                  {inputValue.trim()
+                    ? "Enter로 직접 입력 확정"
+                    : "일치하는 키가 없습니다."}
+                </CommandEmpty>
+                <CommandGroup>
+                  {keys.map((k) => (
+                    <CommandItem
+                      key={k}
+                      value={k}
+                      onSelect={(v) => {
+                        onValueChange(v === value ? "" : v);
+                        setOpen(false);
+                      }}
+                      className="text-xs"
+                    >
+                      <Check
+                        className={cn(
+                          "mr-2 h-3 w-3",
+                          value === k ? "opacity-100" : "opacity-0"
+                        )}
+                      />
+                      {k}
+                    </CommandItem>
+                  ))}
+                </CommandGroup>
+              </>
+            )}
           </CommandList>
         </Command>
       </PopoverContent>