diff --git a/js/bootstrap.admin.js b/js/bootstrap.admin.js
index 4036ade..b614173 100644
--- a/js/bootstrap.admin.js
+++ b/js/bootstrap.admin.js
@@ -62,7 +62,7 @@
         if ($context.find('input[name="bootstrap_javascript_tooltip"]').is(':checked')) {
           summary.push(Drupal.t('Tooltip'));
         }
-        return 'On pageload: ' + summary.join(', ');
+        return summary.join(', ');
       });
 
       // Advanced.
diff --git a/js/bootstrap.js b/js/bootstrap.js
index 0ede46d..b26aa34 100644
--- a/js/bootstrap.js
+++ b/js/bootstrap.js
@@ -62,14 +62,16 @@ var Drupal = Drupal || {};
       });
       // Init popovers on pageload when settings is set.
       if (settings.bootstrap.javascript.popover) {
-        $(context).find('[data-toggle="popover"]').once('bootstrap-popover', function() {
-          $(this).popover();
+        $(context).one('click.drupal.popover.data-api', '[data-toggle="popover"]', function(e) {
+          e.preventDefault();
+          $(this).popover('show');
         });
       }
       // Init tooltips on pageload when settings is set.
       if (settings.bootstrap.javascript.tooltip) {
-        $(context).find('[data-toggle="tooltip"]').once('bootstrap-tooltip', function () {
-          $(this).tooltip();
+        $(context).one('mouseenter.drupal.tooltip.data-api focus.drupal.tooltip.data-api', '[data-toggle="tooltip"]', function (e) {
+          e.preventDefault();
+          $(this).tooltip('show');
         });
       }
     }
diff --git a/theme/settings.inc b/theme/settings.inc
index 7f56595..3ea7756 100644
--- a/theme/settings.inc
+++ b/theme/settings.inc
@@ -215,14 +215,14 @@ function _bootstrap_settings_form(&$form, $form_state) {
   );
   $form['javascript']['bootstrap_javascript_popover'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Load popovers on pageload.'),
-    '#description' => t('Check if you want to load all popovers defined by ') . '<i>data-toggle="popover"</i>.',
+    '#title' => t('Load popovers.'),
+    '#description' => t('Check if you want to load all popovers on click defined by ') . '<i>data-toggle="popover"</i>.',
     '#default_value' => theme_get_setting('bootstrap_javascript_popover'),
   );
   $form['javascript']['bootstrap_javascript_tooltip'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Load tooltips on pageload.'),
-    '#description' => t('Check if you want to load all tooltips defined by ') . '<i>data-toggle="tooltip"</i>.',
+    '#title' => t('Load tooltips.'),
+    '#description' => t('Check if you want to load all tooltips on mouseenter or focus defined by ') . '<i>data-toggle="tooltip"</i>.',
     '#default_value' => theme_get_setting('bootstrap_javascript_tooltip'),
   );