diff --git a/common/lib/xmodule/xmodule/js/src/annotatable/display.coffee b/common/lib/xmodule/xmodule/js/src/annotatable/display.coffee
index c97250c8f8..6a5aae81c5 100644
--- a/common/lib/xmodule/xmodule/js/src/annotatable/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/annotatable/display.coffee
@@ -65,10 +65,12 @@ class @Annotatable
                 mouse: false # dont follow the mouse
                 y: -10
         show:
-            event: 'mouseenter'
+            event: 'click mouseenter'
             solo: true
         hide:
-            event: 'unfocus'
+            event: 'click mouseleave'
+            delay: 250,
+            fixed: true
         style:
             classes: 'ui-tooltip-annotatable'
         events: