diff --git a/datamodels/2.x/itop-attachments/renderers.itop-attachments.php b/datamodels/2.x/itop-attachments/renderers.itop-attachments.php
index 223075e60..8911e21d9 100644
--- a/datamodels/2.x/itop-attachments/renderers.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/renderers.itop-attachments.php
@@ -450,9 +450,17 @@ class TableDetailsAttachmentsRenderer extends AbstractAttachmentsRenderer
 		$oAttachmentTableBlock = DataTableUIBlockFactory::MakeForStaticData('', $aAttribs, $aData);
 		$oAttachmentTableBlock->AddCSSClass('ibo-attachment--datatable');
 		$this->oPage->AddUiBlock($oAttachmentTableBlock);
-		foreach ($aData as $aRow) {
-			$this->oPage->add_ready_script($aRow['js']);
-		}
+		
+		$sTableId = $oAttachmentTableBlock->GetId();
+		$this->oPage->add_script(			
+<<<JS
+$('#$sTableId').on('inited drawn', function(){
+	$('#$sTableId [data-tooltip-content]').each(function(){
+		CombodoGlobalToolbox.InitTooltipFromMarkup($(this), true);
+	});
+});
+JS
+		);
 	}
 
 	/**
@@ -541,7 +549,6 @@ class TableDetailsAttachmentsRenderer extends AbstractAttachmentsRenderer
 			'upload-date' => $sAttachmentDateFormatted,
 			'uploader' => $sAttachmentUploader,
 			'type' => $sFileType,
-			'js' => 'CombodoGlobalToolbox.InitTooltipFromMarkup($("#$sTrId [data-tooltip-content]"));',
 		);
 		
 		if ($bWithDeleteButton)
diff --git a/templates/base/components/datatable/layout.ready.js.twig b/templates/base/components/datatable/layout.ready.js.twig
index 989f5d753..4e42889ba 100644
--- a/templates/base/components/datatable/layout.ready.js.twig
+++ b/templates/base/components/datatable/layout.ready.js.twig
@@ -108,6 +108,7 @@ var oTable{{ sListId }} = $('#{{ oUIBlock.GetId() }}').DataTable({
         {
             $(this).closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info').show();
         }
+        $('#{{ oUIBlock.GetId() }}').trigger('drawn');
     },
     {% endif %}
     rowId: "id",
@@ -183,6 +184,7 @@ var oTable{{ sListId }} = $('#{{ oUIBlock.GetId() }}').DataTable({
             this.parent().find('.dataTables_paginate').hide();
             this.parent().find('.dataTables_length').hide();
         }
+        $('#{{ oUIBlock.GetId() }}').trigger('inited');
     }
 });
 
diff --git a/templates/base/components/datatable/static/layout.ready.js.twig b/templates/base/components/datatable/static/layout.ready.js.twig
index 4d778ece3..0ae0a8366 100644
--- a/templates/base/components/datatable/static/layout.ready.js.twig
+++ b/templates/base/components/datatable/static/layout.ready.js.twig
@@ -46,5 +46,11 @@ $('#{{ oUIBlock.GetId() }}').DataTable({
             sortable: true
         },
         {% endfor %}
-    ]
+    ],
+    initComplete: function () {
+        $('#{{ oUIBlock.GetId() }}').trigger('inited');
+    },
+    drawCallback: function(){
+        $('#{{ oUIBlock.GetId() }}').trigger('drawn');
+    }
 });
\ No newline at end of file