diff --git a/javascript.html b/javascript.html
index 0dffa5db8..40ea1a924 100644
--- a/javascript.html
+++ b/javascript.html
@@ -970,6 +970,10 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
       <h4>Popovers in button groups and input groups require special setting</h4>
       <p>When using popovers on elements within a <code>.btn-group</code> or an <code>.input-group</code>, you'll have to specify the option <code>container: 'body'</code> (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the popover is triggered).</p>
     </div>
+    <div class="bs-callout bs-callout-info">
+      <h4>Popovers on disabled elements require wrapper elements</h4>
+      <p>To add a popover to a <code>disabled</code> or <code>.disabled</code> element, put the element inside of a <code>&lt;div&gt;</code> or <code>&lt;span&gt;</code>, and apply the popover to that element instead.</p>
+    </div>
 
     <h3>Static popover</h3>
     <p>Four options are available: top, right, bottom, and left aligned.</p>