diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index 351573cf43..b7dc450972 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -105,11 +105,6 @@ setupSortable = (model) ->
 setupTooltips = (model) ->
   $('[rel=tooltip]').tooltip()
   $('[rel=popover]').popover()
-  # FIXME: this isn't very efficient, do model.on set for specific attrs for popover
-  model.on 'set', '*', ->
-    $('[rel=tooltip]').tooltip()
-    $('[rel=popover]').popover()
-
 
 setupTour = (model) ->
   tourSteps = [
diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index f84e8d2b2f..50a7fa976b 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -172,3 +172,8 @@ module.exports.app = (appExports, model) ->
     direction = 'down' if direction == 'false/'
     task = model.at $(el).parents('li')[0]
     scoring.score(model, task.get('id'), direction)
+
+  appExports.tasksSaveAndClose = ->
+    # When they update their notes, re-establish tooltip & popover
+    $('[rel=tooltip]').tooltip()
+    $('[rel=popover]').popover()