diff --git a/public/directives/wazuh-table/controller.js b/public/directives/wazuh-table/controller.js
index 8c7136114..74ad8b4e8 100644
--- a/public/directives/wazuh-table/controller.js
+++ b/public/directives/wazuh-table/controller.js
@@ -273,17 +273,33 @@ app.directive('wazuhTable', function() {
                 return array;
             };
 
-            $scope.checkIfArray = item => {
-                return typeof item === 'object' ? 
-                       splitArray(item) :
-                       item == 0 ? '0' : item;
-            };
-
+            const checkIfArray = item => typeof item === 'object' ? 
+                                                 splitArray(item) :
+                                                        item == 0 ? 
+                                                              '0' : 
+                                                              item;
+            
             $scope.$on('$destroy',() => {
                 realTime = null;
                 wzTableFilter.set([]);
             });
 
+            $scope.nonDecoderValue = (key,item) => {
+                return  key === 'os.name' ? 
+                        item.os.name || '---' : 
+                        key === 'os.version' ? 
+                        item.os.version || '---' : 
+                        checkIfArray(item[key.value || key]) || '---';
+            };
+
+            $scope.decoderValue = (key,item) => {
+                return  key === 'details.program_name' || key.value === 'details.program_name' ? 
+                        item.details.program_name || '---' : 
+                        key === 'details.order' || key.value === 'details.order' ? 
+                        item.details.order || '---' : 
+                        checkIfArray(item[key.value || key]) || '---'; 
+            };
+
         },
         template: template
     }
diff --git a/public/directives/wazuh-table/template.html b/public/directives/wazuh-table/template.html
index 4a81f1a21..91f5d9de8 100644
--- a/public/directives/wazuh-table/template.html
+++ b/public/directives/wazuh-table/template.html
@@ -17,21 +17,21 @@
             <tr ng-class="allowClick ? 'cursor-pointer' : ''" class="wz-word-wrap" ng-repeat="item in pagedItems[currentPage] | filter:{item:'!'}" ng-click="clickAction(item)">
                 <td ng-repeat="key in keys" ng-if="path !== '/decoders'">
                     {{ 
-                        key === 'os.name' ? 
-                        item.os.name || '---' : 
-                        key === 'os.version' ? 
-                        item.os.version || '---' : 
-                        checkIfArray(item[key.value || key]) || '---' 
+                        nonDecoderValue(key,item) | limitTo: 25
                     }}
+                    <span ng-if="nonDecoderValue(key,item).length > 25">...</span>
+                    <md-tooltip ng-if="nonDecoderValue(key,item).length > 25" md-direction="bottom" class="wz-tooltip">
+                        {{ nonDecoderValue(key,item) }}
+                    </md-tooltip>
                 </td>
                 <td ng-repeat="key in keys" ng-if="path === '/decoders'">
                     {{ 
-                        key === 'details.program_name' || key.value === 'details.program_name' ? 
-                        item.details.program_name || '---' : 
-                        key === 'details.order' || key.value === 'details.order' ? 
-                        item.details.order || '---' : 
-                        checkIfArray(item[key.value || key]) || '---' 
+                        decoderValue(key,item) | limitTo: 25 
                     }}
+                    <span ng-if="decoderValue(key,item).length > 25">...</span>
+                    <md-tooltip ng-if="decoderValue(key,item).length > 25" md-direction="bottom" class="wz-tooltip">
+                        {{ decoderValue(key,item) }}
+                    </md-tooltip>
                 </td>
                 
             </tr>