diff --git a/fe-admin/src/pages/contracts/ContractCreatePage.tsx b/fe-admin/src/pages/contracts/ContractCreatePage.tsx
index f23383d..fadd205 100644
--- a/fe-admin/src/pages/contracts/ContractCreatePage.tsx
+++ b/fe-admin/src/pages/contracts/ContractCreatePage.tsx
@@ -186,32 +186,47 @@ export function ContractCreatePage() {
                     </div>
                   </button>
 
-                  {/* Action buttons — Edit + Xóa, CHỈ hiện khi Phase = DangSoanThao
-                      (state nhập liệu / điều chỉnh). Sau khi nộp lên Góp ý → ẩn cả 2.
+                  {/* Action buttons — Edit + Xóa luôn hiển thị; mờ + disabled khi
+                      Phase != DangSoanThao (BE chỉ cho update/delete khi draft).
                       Sibling không nested để click không trigger row select. */}
-                  {c.phase === ContractPhase.DangSoanThao && (
-                    <div className="absolute right-2 top-2 z-10 flex gap-0.5 opacity-0 transition group-hover:opacity-100">
-                      <button
-                        onClick={() => selectContract(c.id)}
-                        title="Chỉnh sửa HĐ"
-                        className="rounded p-1 text-slate-500 hover:bg-white hover:text-brand-600 hover:shadow-sm"
-                      >
-                        <Pencil className="h-3.5 w-3.5" />
-                      </button>
-                      <button
-                        onClick={() => {
-                          if (confirm(`Xóa HĐ "${c.tenHopDong ?? c.maHopDong ?? 'này'}"?`)) {
-                            deleteContract.mutate(c.id)
-                          }
-                        }}
-                        title="Xóa HĐ"
-                        className="rounded p-1 text-slate-500 hover:bg-white hover:text-red-600 hover:shadow-sm"
-                        disabled={deleteContract.isPending}
-                      >
-                        <Trash2 className="h-3.5 w-3.5" />
-                      </button>
-                    </div>
-                  )}
+                  {(() => {
+                    const canMutate = c.phase === ContractPhase.DangSoanThao
+                    return (
+                      <div className="absolute right-2 top-2 z-10 flex gap-0.5 opacity-60 transition group-hover:opacity-100">
+                        <button
+                          onClick={() => canMutate && selectContract(c.id)}
+                          disabled={!canMutate}
+                          title={canMutate ? 'Chỉnh sửa HĐ' : 'Chỉ sửa được khi Phase = Đang soạn thảo'}
+                          className={cn(
+                            'rounded p-1 transition',
+                            canMutate
+                              ? 'text-slate-500 hover:bg-white hover:text-brand-600 hover:shadow-sm'
+                              : 'cursor-not-allowed text-slate-300',
+                          )}
+                        >
+                          <Pencil className="h-3.5 w-3.5" />
+                        </button>
+                        <button
+                          onClick={() => {
+                            if (!canMutate) return
+                            if (confirm(`Xóa HĐ "${c.tenHopDong ?? c.maHopDong ?? 'này'}"?`)) {
+                              deleteContract.mutate(c.id)
+                            }
+                          }}
+                          disabled={!canMutate || deleteContract.isPending}
+                          title={canMutate ? 'Xóa HĐ' : 'Chỉ xóa được khi Phase = Đang soạn thảo'}
+                          className={cn(
+                            'rounded p-1 transition',
+                            canMutate
+                              ? 'text-slate-500 hover:bg-white hover:text-red-600 hover:shadow-sm'
+                              : 'cursor-not-allowed text-slate-300',
+                          )}
+                        >
+                          <Trash2 className="h-3.5 w-3.5" />
+                        </button>
+                      </div>
+                    )
+                  })()}
                 </li>
               ))}
             </ul>
diff --git a/fe-user/src/pages/contracts/ContractCreatePage.tsx b/fe-user/src/pages/contracts/ContractCreatePage.tsx
index f23383d..fadd205 100644
--- a/fe-user/src/pages/contracts/ContractCreatePage.tsx
+++ b/fe-user/src/pages/contracts/ContractCreatePage.tsx
@@ -186,32 +186,47 @@ export function ContractCreatePage() {
                     </div>
                   </button>
 
-                  {/* Action buttons — Edit + Xóa, CHỈ hiện khi Phase = DangSoanThao
-                      (state nhập liệu / điều chỉnh). Sau khi nộp lên Góp ý → ẩn cả 2.
+                  {/* Action buttons — Edit + Xóa luôn hiển thị; mờ + disabled khi
+                      Phase != DangSoanThao (BE chỉ cho update/delete khi draft).
                       Sibling không nested để click không trigger row select. */}
-                  {c.phase === ContractPhase.DangSoanThao && (
-                    <div className="absolute right-2 top-2 z-10 flex gap-0.5 opacity-0 transition group-hover:opacity-100">
-                      <button
-                        onClick={() => selectContract(c.id)}
-                        title="Chỉnh sửa HĐ"
-                        className="rounded p-1 text-slate-500 hover:bg-white hover:text-brand-600 hover:shadow-sm"
-                      >
-                        <Pencil className="h-3.5 w-3.5" />
-                      </button>
-                      <button
-                        onClick={() => {
-                          if (confirm(`Xóa HĐ "${c.tenHopDong ?? c.maHopDong ?? 'này'}"?`)) {
-                            deleteContract.mutate(c.id)
-                          }
-                        }}
-                        title="Xóa HĐ"
-                        className="rounded p-1 text-slate-500 hover:bg-white hover:text-red-600 hover:shadow-sm"
-                        disabled={deleteContract.isPending}
-                      >
-                        <Trash2 className="h-3.5 w-3.5" />
-                      </button>
-                    </div>
-                  )}
+                  {(() => {
+                    const canMutate = c.phase === ContractPhase.DangSoanThao
+                    return (
+                      <div className="absolute right-2 top-2 z-10 flex gap-0.5 opacity-60 transition group-hover:opacity-100">
+                        <button
+                          onClick={() => canMutate && selectContract(c.id)}
+                          disabled={!canMutate}
+                          title={canMutate ? 'Chỉnh sửa HĐ' : 'Chỉ sửa được khi Phase = Đang soạn thảo'}
+                          className={cn(
+                            'rounded p-1 transition',
+                            canMutate
+                              ? 'text-slate-500 hover:bg-white hover:text-brand-600 hover:shadow-sm'
+                              : 'cursor-not-allowed text-slate-300',
+                          )}
+                        >
+                          <Pencil className="h-3.5 w-3.5" />
+                        </button>
+                        <button
+                          onClick={() => {
+                            if (!canMutate) return
+                            if (confirm(`Xóa HĐ "${c.tenHopDong ?? c.maHopDong ?? 'này'}"?`)) {
+                              deleteContract.mutate(c.id)
+                            }
+                          }}
+                          disabled={!canMutate || deleteContract.isPending}
+                          title={canMutate ? 'Xóa HĐ' : 'Chỉ xóa được khi Phase = Đang soạn thảo'}
+                          className={cn(
+                            'rounded p-1 transition',
+                            canMutate
+                              ? 'text-slate-500 hover:bg-white hover:text-red-600 hover:shadow-sm'
+                              : 'cursor-not-allowed text-slate-300',
+                          )}
+                        >
+                          <Trash2 className="h-3.5 w-3.5" />
+                        </button>
+                      </div>
+                    )
+                  })()}
                 </li>
               ))}
             </ul>