diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index 0b3ba3669c39..0b94d7560488 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -303,6 +303,10 @@ const Tooltip = (($) => {
           if (prevHoverState === HoverState.OUT) {
             this._leave(null, this)
           }
+
+          if ($(this.element).parents('.modal').length > 0) {
+            $(tip).appendTo($(this.element).parents('.modal').get(0))
+          }
         }
 
         if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) {