diff --git a/modules/util/tooltip.js b/modules/util/tooltip.js
index 1bf8e9555..44d8dc33d 100644
--- a/modules/util/tooltip.js
+++ b/modules/util/tooltip.js
@@ -22,6 +22,7 @@ export function tooltip() {
     out = 'mouseleave.tooltip',
     placement = utilFunctor('top');
 
+
   tooltip.title = function(_) {
     if (arguments.length) {
       title = utilFunctor(_);
@@ -31,6 +32,7 @@ export function tooltip() {
     }
   };
 
+
   tooltip.html = function(_) {
     if (arguments.length) {
       html = utilFunctor(_);
@@ -40,6 +42,7 @@ export function tooltip() {
     }
   };
 
+
   tooltip.placement = function(_) {
     if (arguments.length) {
       placement = utilFunctor(_);
@@ -49,18 +52,22 @@ export function tooltip() {
     }
   };
 
+
   tooltip.show = function(selection) {
     selection.each(show);
   };
 
+
   tooltip.hide = function(selection) {
     selection.each(hide);
   };
 
+
   tooltip.toggle = function(selection) {
     selection.each(toggle);
   };
 
+
   tooltip.destroy = function(selection) {
     selection
       .on(over, null)
@@ -69,25 +76,35 @@ export function tooltip() {
         return this.getAttribute('data-original-title') || this.getAttribute('title');
       })
       .attr('data-original-title', null)
-      .select('.tooltip')
+      .selectAll('.tooltip')
       .remove();
   };
 
+
   function setup() {
     var root = d3.select(this),
         animate = animation.apply(this, arguments),
-        tip = root.append('div')
-          .attr('class', 'tooltip');
+        tip = root.selectAll('.tooltip').data([0]);
+
+    var enter = tip.enter()
+      .append('div')
+      .attr('class', 'tooltip');
+
+    enter
+      .append('div')
+      .attr('class', 'tooltip-arrow');
+
+    enter
+      .append('div')
+      .attr('class', 'tooltip-inner');
+
+    tip = enter
+      .merge(tip);
 
     if (animate) {
       tip.classed('fade', true);
     }
 
-    tip.append('div')
-      .attr('class', 'tooltip-arrow');
-    tip.append('div')
-      .attr('class', 'tooltip-inner');
-
     var place = placement.apply(this, arguments);
     tip.classed(place, true);
 
@@ -95,13 +112,15 @@ export function tooltip() {
     root.on(out, hide);
   }
 
+
   function show() {
     var root = d3.select(this),
       content = title.apply(this, arguments),
-      tip = root.select('.tooltip')
+      tip = root.selectAll('.tooltip')
         .classed('in', true),
       markup = html.apply(this, arguments);
-    tip.select('.tooltip-inner')[markup ? 'html' : 'text'](content);
+
+    tip.selectAll('.tooltip-inner')[markup ? 'html' : 'text'](content);
     var place = placement.apply(this, arguments),
       outer = getPosition(root.node()),
       inner = getPosition(tip.node()),
@@ -131,13 +150,15 @@ export function tooltip() {
     this.tooltipVisible = true;
   }
 
+
   function hide() {
-    d3.select(this).select('.tooltip')
+    d3.select(this).selectAll('.tooltip')
       .classed('in', false);
 
     this.tooltipVisible = false;
   }
 
+
   function toggle() {
     if (this.tooltipVisible) {
       hide.apply(this, arguments);
@@ -149,6 +170,7 @@ export function tooltip() {
   return tooltip;
 }
 
+
 function getPosition(node) {
   var mode = d3.select(node).style('position');
   if (mode === 'absolute' || mode === 'static') {