diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 39b99a65..221e83b0 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -120,6 +120,20 @@ $(function() {
 
     // Use bootstrap datepicker for dateinput
     $('.datepicker').datepicker({format: 'yyyy-mm-dd', language: I18n.locale});
+
+    // bootstrap tooltips (for price)
+    //   Extra options don't work when using selector, so override defaults
+    //   https://github.com/twbs/bootstrap/issues/3875 . These can still be
+    //   overridden per tooltip using data-placement attributes and the like.
+    $.extend($.fn.tooltip.defaults, {
+      html: true,
+      animation: false,
+      placement: 'left',
+      container: 'body'
+    });
+    $(document).tooltip({
+      selector: '[data-toggle~="tooltip"]',
+    });
     
     // See stupidtable.js for initialization of local table sorting
 });
@@ -146,3 +160,5 @@ function highlightRow(checkbox) {
 function setHiddenId(text, li) {
   $('hidden_id').value = li.id;
 }
+
+
diff --git a/app/views/deliveries/_form.html.haml b/app/views/deliveries/_form.html.haml
index c9bd8fcd..3e1a3b6c 100644
--- a/app/views/deliveries/_form.html.haml
+++ b/app/views/deliveries/_form.html.haml
@@ -61,8 +61,6 @@
           return true;
         }
       });
-      
-      enablePriceTooltips();
     });
     
     function mark_article_for_delivery(stock_article_id) {
@@ -80,15 +78,6 @@
       return ( 0 == $('#stock_change_stock_article_' + stock_article_id).length );
     }
 
-    function enablePriceTooltips(context) {
-      $('[data-toggle~="tooltip"]', context).tooltip({
-        animation: false,
-        html: true,
-        placement: 'left',
-        container: 'body' // or they become a cell in the table
-      });
-    }
-
 = simple_form_for [@supplier, @delivery], validate: true do |f|
   = f.error_notification
   = base_errors f.object
diff --git a/app/views/deliveries/add_stock_change.js.erb b/app/views/deliveries/add_stock_change.js.erb
index 3e233bb6..2d01bc68 100644
--- a/app/views/deliveries/add_stock_change.js.erb
+++ b/app/views/deliveries/add_stock_change.js.erb
@@ -13,7 +13,6 @@
   var stock_change = $(
     '<%= j(render(:partial => 'stock_change', :locals => {:stock_change => @stock_change})) %>'
   ).addClass('success');
-  enablePriceTooltips(stock_change);
   $('input.stock-change-quantity', stock_change).val(quantity);
   
   $('#stock_changes').append(stock_change);
diff --git a/app/views/deliveries/create_stock_article.js.erb b/app/views/deliveries/create_stock_article.js.erb
index 5e2893a9..cb9d0159 100644
--- a/app/views/deliveries/create_stock_article.js.erb
+++ b/app/views/deliveries/create_stock_article.js.erb
@@ -8,7 +8,6 @@ $('div.container-fluid').prepend(
   var stock_article_for_adding = $(
     '<%= j(render(:partial => 'stock_article_for_adding', :locals => {:article => @stock_article})) %>'
   ).addClass('success');
-  enablePriceTooltips(stock_article_for_adding);
   
   $('#stock_articles_for_adding tbody').append(stock_article_for_adding);
   updateSort('#stock_articles_for_adding');
diff --git a/app/views/deliveries/update_stock_article.js.erb b/app/views/deliveries/update_stock_article.js.erb
index ef46636d..7b2d56d6 100644
--- a/app/views/deliveries/update_stock_article.js.erb
+++ b/app/views/deliveries/update_stock_article.js.erb
@@ -10,7 +10,6 @@ $('div.container-fluid').prepend(
   var stock_article_for_adding = $(
     '<%= j(render(:partial => 'stock_article_for_adding', :locals => {:article => @stock_article, :delivery => @delivery})) %>'
   ).addClass('success');
-  enablePriceTooltips(stock_article_for_adding);
   
   $('#stock_article_<%= @stock_article.id %>').replaceWith(stock_article_for_adding);
   updateSort('#stock_articles_for_adding');
diff --git a/app/views/stock_takings/new.html.haml b/app/views/stock_takings/new.html.haml
index 6e4526f9..51239ba4 100644
--- a/app/views/stock_takings/new.html.haml
+++ b/app/views/stock_takings/new.html.haml
@@ -1,20 +1,5 @@
 - title t('.title')
 
-- content_for :javascript do
-  :javascript
-    $(function() {
-      enablePriceTooltips();
-    });
-
-    function enablePriceTooltips(context) {
-      $('[data-toggle~="tooltip"]', context).tooltip({
-        animation: false,
-        html: true,
-        placement: 'left',
-        container: 'body'
-      });
-    }
-
 - content_for :sidebar do
   %p
     %i= t('.text_deviations', inv_link: link_to(t('.temp_inventory'), stock_articles_path)).html_safe