diff --git a/src/General/UI.coffee b/src/General/UI.coffee
index dff2be93f..b0309b62a 100644
--- a/src/General/UI.coffee
+++ b/src/General/UI.coffee
@@ -139,6 +139,8 @@ UI = do ->
       e.preventDefault()
       e.stopPropagation()
 
+    onFocus: (e) =>
+      @focus e.target
     focus: (entry) ->
       while focused = $.x 'parent::*/child::*[contains(@class,"focused")]', entry
         $.rmClass focused, 'focused'
@@ -174,10 +176,7 @@ UI = do ->
     parseEntry: (entry) ->
       {el, subEntries} = entry
       $.addClass el, 'entry'
-      $.on el, 'focus mouseover', ((e) ->
-        e.stopPropagation()
-        @focus el
-      ).bind @
+      $.on el, 'focus mouseenter', @onFocus
       el.style.order = entry.order or 100
       return unless subEntries
       $.addClass el, 'has-submenu'