diff --git a/biscuit/core/static/js/main.js b/biscuit/core/static/js/main.js
index 4d763f53f9f8a28e7a0c025c328569e119355e32..a523a322d4a40421bb55ddcfb4db604911a06d78 100644
--- a/biscuit/core/static/js/main.js
+++ b/biscuit/core/static/js/main.js
@@ -5,6 +5,11 @@ $(document).ready( function () {
         });
     });
 
+    $('*:not(a, span)[data-poload]').each(function() {
+        $(this).find('a, span').attr('data-poload', $(this).attr('data-poload'));
+        $(this).removeAttr('data-poload');
+    });
+
     $('*[data-poload]').popover({
         html: true,
 	animation: true,