diff --git a/resources/js/common/PMColumnFilterPopoverCommonMixin.js b/resources/js/common/PMColumnFilterPopoverCommonMixin.js
index d68c200839..8060bf01c5 100644
--- a/resources/js/common/PMColumnFilterPopoverCommonMixin.js
+++ b/resources/js/common/PMColumnFilterPopoverCommonMixin.js
@@ -266,10 +266,18 @@ const PMColumnFilterCommonMixin = {
         this.tableHeaders[i].sortDesc = false;
       }
       for (let i in this.tableHeaders) {
-        if (this.orderBy.endsWith(this.tableHeaders[i].field)) {
-          let sort = this.sortOrder[0].direction;
-          this.tableHeaders[i].sortAsc = (sort.toLowerCase() === "asc");
-          this.tableHeaders[i].sortDesc = (sort.toLowerCase() === "desc");
+        if (this.tableHeaders[i].order_column !== undefined) {
+          if (this.orderBy === this.tableHeaders[i].order_column) {
+            let sort = this.sortOrder[0].direction;
+            this.tableHeaders[i].sortAsc = (sort.toLowerCase() === "asc");
+            this.tableHeaders[i].sortDesc = (sort.toLowerCase() === "desc");
+          }
+        } else {
+          if (this.orderBy.endsWith(this.tableHeaders[i].field)) {
+            let sort = this.sortOrder[0].direction;
+            this.tableHeaders[i].sortAsc = (sort.toLowerCase() === "asc");
+            this.tableHeaders[i].sortDesc = (sort.toLowerCase() === "desc");
+          }
         }
       }
       for (let i in this.tableHeaders) {