diff --git a/app/assets/javascripts/locomotive/views/application_view.js.coffee b/app/assets/javascripts/locomotive/views/application_view.js.coffee
index e5e4cac7..9409a818 100644
--- a/app/assets/javascripts/locomotive/views/application_view.js.coffee
+++ b/app/assets/javascripts/locomotive/views/application_view.js.coffee
@@ -35,11 +35,12 @@ class Locomotive.Views.ApplicationView extends Backbone.View
     $('#submenu ul li.hoverable').each ->
       timer = null
       link  = $(@)
-      (popup = link.find('.popup')).removeClass('popup').addClass('submenu-popup').css(
-        top:  link.offset().top + link.height() - 2
-        left: link.offset().left - parseInt(popup.css('padding-left'))
+      (popup = link.find('.popup')).removeClass('popup').addClass('submenu-popup'
       ).bind('show', ->
-        link.find('a').addClass('hover') & popup.show()
+        link.find('a').addClass('hover') & popup.css(
+          top:  link.offset().top + link.height() - 2
+          left: link.offset().left - parseInt(popup.css('padding-left'))
+        ).show()
       ).bind('hide', ->
         link.find('a').removeClass('hover') & $(@).hide()
       ).bind('mouseleave', -> popup.trigger('hide')
diff --git a/doc/TODO b/doc/TODO
index 367630a4..e7b82339 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -64,8 +64,8 @@ x edit my site
     x public_form (previously api something)
     x bug text formatting
     x custom_fields: use the appropriate icon to drag select options
+    x bug ui with contents popup
     - use list_or_group_entries instead of ordered_entries
-    - bug ui with contents popup
 - i18n
   x add locales a site responds to
   x locale switcher