diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 023c80877ef..4931ec103be 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3307,6 +3307,8 @@ body.oe_single_form .oe_single_form_container {
   background: white;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   background-color: transparent;
+  /*We need a greater z-index in order for tooltip to go over bootstrap modal z-index*/
+  z-index: 1500;
 }
 .tooltip .tooltip-inner {
   text-align: left !important;
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 5339fa80615..acb4c2b4996 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -792,6 +792,7 @@ instance.web.unblockUI = function() {
 /* Bootstrap defaults overwrite */
 $.fn.tooltip.Constructor.DEFAULTS.placement = 'bottom';
 $.fn.tooltip.Constructor.DEFAULTS.html = true;
+$.fn.tooltip.Constructor.DEFAULTS.container = 'body';
 
 /**
  * Registry for all the client actions key: tag value: widget