diff --git a/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqEdit.razor b/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqEdit.razor
index f19d520..30f18b6 100644
--- a/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqEdit.razor
+++ b/TaxBaik.Web/Components/Admin/Pages/Faqs/FaqEdit.razor
@@ -43,12 +43,7 @@
                                   Placeholder="방문자에게 보여질 답변을 입력하세요." />
                 </MudItem>
                 <MudItem xs="12" md="6">
-                    <MudSelect @bind-Value="faq.Category" Label="카테고리" T="string" Clearable="true">
-                        @foreach (var cat in FaqService.Categories)
-                        {
-                            <MudSelectItem Value="@cat">@cat</MudSelectItem>
-                        }
-                    </MudSelect>
+                    <CommonCodeSelect @bind-Value="faq.Category" Group="FAQ_CATEGORY" Label="카테고리" Clearable="true" Placeholder="전체" />
                 </MudItem>
                 <MudItem xs="12" md="3">
                     <MudNumericField @bind-Value="faq.SortOrder"
diff --git a/db/migrations/V032__SeedFaqCategoryCommonCodes.sql b/db/migrations/V032__SeedFaqCategoryCommonCodes.sql
new file mode 100644
index 0000000..c27ad15
--- /dev/null
+++ b/db/migrations/V032__SeedFaqCategoryCommonCodes.sql
@@ -0,0 +1,15 @@
+INSERT INTO common_codes (code_group, code_value, code_name, sort_order)
+SELECT v.code_group, v.code_value, v.code_name, v.sort_order
+FROM (
+    VALUES
+        ('FAQ_CATEGORY', '기장세금신고', '기장세금신고', 10),
+        ('FAQ_CATEGORY', '부동산', '부동산', 20),
+        ('FAQ_CATEGORY', '증여상속', '증여상속', 30),
+        ('FAQ_CATEGORY', '기타', '기타', 40)
+) AS v(code_group, code_value, code_name, sort_order)
+WHERE NOT EXISTS (
+    SELECT 1
+    FROM common_codes cc
+    WHERE cc.code_group = v.code_group
+      AND cc.code_value = v.code_value
+);
diff --git a/docs/COMMON_CODE_POLICY.md b/docs/COMMON_CODE_POLICY.md
index ac992ce..030a453 100644
--- a/docs/COMMON_CODE_POLICY.md
+++ b/docs/COMMON_CODE_POLICY.md
@@ -33,6 +33,7 @@
 - `FILING_TYPE`
 - `TAX_RISK_LEVEL`
 - `BUSINESS_TYPE`
+- `FAQ_CATEGORY`
 
 ## Data Rules