diff --git a/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue b/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue
index 7de68eb474..98fa2d40f1 100644
--- a/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue
+++ b/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue
@@ -691,6 +691,11 @@ export default {
   border-bottom: 1px solid rgba(31, 35, 41, 0.15);
 }
 
+:deep(.el-table th > .cell) {
+  word-break: keep-all !important;
+  white-space: nowrap !important;
+}
+
 :deep(.ms-select-all-fixed th:nth-child(2) .table-select-icon) {
   position: absolute;
   display: inline-block;
diff --git a/framework/sdk-parent/frontend/src/components/table/MsTableColumn.vue b/framework/sdk-parent/frontend/src/components/table/MsTableColumn.vue
index 3cd7110814..eead85bd2d 100644
--- a/framework/sdk-parent/frontend/src/components/table/MsTableColumn.vue
+++ b/framework/sdk-parent/frontend/src/components/table/MsTableColumn.vue
@@ -11,6 +11,7 @@
                    :sortable="sortable"
                    :filter-method="filterMethod"
                    :filtered-value="filteredValue	"
+                   :render-header="renderHeader"
                    :show-overflow-tooltip="showOverflowTooltip">
 
     <template v-slot:default="scope">
@@ -89,6 +90,26 @@ export default {
   },
   mounted() {
     this.active = true;
+  },
+  methods: {
+    renderHeader(h, data) {
+      if (data.column.label.length > 7) {
+        return h("span", [
+          h("el-tooltip", {
+            attrs: {
+              class: "item",
+              effect: "dark",
+              content: data.column.label,
+              placement: "top"
+            }
+          }, [
+            h("span", data.column.label)
+          ])
+        ])
+      } else {
+        return h("span", data.column.label);
+      }
+    }
   }
 };
 </script>