diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index da72ef5171d..26b3e308d5b 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -19,6 +19,7 @@
 - Fix `n-menu`'s disabled style not working when parent node is set to `disabled` and child node has `type: "group"`, closes [#6792](https://github.com/tusen-ai/naive-ui/issues/6792)
 - Fix `n-input-group-label` not injecting `formItemInjectionKey`, causing the `size` property to fail, and close [#7066](https://github.com/tusen-ai/naive-ui/issues/7066)
 - Fix the issue of style confusion in `n-carousel` when there is only one image, close [#6476](https://github.com/tusen-ai/naive-ui/issues/6476)
+- Fix `n-data-table` sorting state color variable theme not working in modal and popover context.
 
 ### Features
 
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 8b74b2fcc71..78e8f93f019 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -19,6 +19,7 @@
 - 修复 `n-menu` 在父节点设置 `disabled`，子节点为 `type: "group"` 的禁用样式失效，关闭 [#6792](https://github.com/tusen-ai/naive-ui/issues/6792)
 - 修复 `n-input-group-label` 没有注入 `formItemInjectionKey`，导致 `size` 属性失效的问题，关闭 [#7066](https://github.com/tusen-ai/naive-ui/issues/7066)
 - 修复 `n-carousel` 只有一张图的情況下样式错乱的问题，关闭 [#6476](https://github.com/tusen-ai/naive-ui/issues/6476)
+- 修复 `n-data-table` 在模态框和弹出层上下文中排序状态的颜色变量主题不生效的问题
 
 ### Features
 
diff --git a/src/data-table/src/styles/index.cssr.ts b/src/data-table/src/styles/index.cssr.ts
index 6310afd8a51..8df993e95db 100644
--- a/src/data-table/src/styles/index.cssr.ts
+++ b/src/data-table/src/styles/index.cssr.ts
@@ -575,8 +575,8 @@ export default c([
     --n-merged-border-color: var(--n-border-color-modal);
     --n-merged-th-color-hover: var(--n-th-color-hover-modal);
     --n-merged-td-color-hover: var(--n-td-color-hover-modal);
-    --n-merged-th-color-sorting: var(--n-th-color-hover-modal);
-    --n-merged-td-color-sorting: var(--n-td-color-hover-modal);
+    --n-merged-th-color-sorting: var(--n-th-color-sorting-modal);
+    --n-merged-td-color-sorting: var(--n-td-color-sorting-modal);
     --n-merged-td-color-striped: var(--n-td-color-striped-modal);
   `)),
   insidePopover(cB('data-table', `
@@ -585,8 +585,8 @@ export default c([
     --n-merged-border-color: var(--n-border-color-popover);
     --n-merged-th-color-hover: var(--n-th-color-hover-popover);
     --n-merged-td-color-hover: var(--n-td-color-hover-popover);
-    --n-merged-th-color-sorting: var(--n-th-color-hover-popover);
-    --n-merged-td-color-sorting: var(--n-td-color-hover-popover);
+    --n-merged-th-color-sorting: var(--n-th-color-sorting-popover);
+    --n-merged-td-color-sorting: var(--n-td-color-sorting-popover);
     --n-merged-td-color-striped: var(--n-td-color-striped-popover);
   `))
 ])