diff --git a/common/static/coffee/src/discussion/tooltip_manager.coffee b/common/static/coffee/src/discussion/tooltip_manager.coffee
index 695ad52e3d..c5fa648532 100644
--- a/common/static/coffee/src/discussion/tooltip_manager.coffee
+++ b/common/static/coffee/src/discussion/tooltip_manager.coffee
@@ -12,10 +12,10 @@ class @TooltipManager
       'click': @hideTooltip
 
   showTooltip: (e) =>
-    tooltipText = $(e.target).attr('data-tooltip')
+    $target = $(e.target).closest('[data-tooltip]')
+    tooltipText = $target.attr('data-tooltip')
     @$tooltip.html(tooltipText)
     @$body.append(@$tooltip)
-    $(e.target).children().css('pointer-events', 'none')
 
     tooltipCoords =
       x: e.pageX - (@$tooltip.outerWidth() / 2)
@@ -26,8 +26,8 @@ class @TooltipManager
     'top': tooltipCoords.y
 
     @tooltipTimer = setTimeout ()=>
-      @$tooltip.show().css('opacity', 1)
 
+      @$tooltip.show().css('opacity', 1)
       @tooltipTimer = setTimeout ()=>
         @hideTooltip()
       , 3000