diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index d11d3c541f..4363584972 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -973,7 +973,12 @@
 
             $(function () {
 
-                $('[data-tooltip="true"]').tooltip();
+                // Invoke Bootstrap 3's tooltip
+                $('[data-tooltip="true"]').tooltip({
+                    container: 'body',
+                    animation: true,
+                });
+                
                 $('[data-toggle="popover"]').popover();
                 $('.select2 span').addClass('needsclick');
                 $('.select2 span').removeAttr('title');
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 011ad4ca9b..bae98373e4 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -85,3 +85,12 @@
     </div>
   @endforeach
 @endif
+
+
+<script nonce="{{ csrf_token() }}">
+    // We have to re-call the tooltip since this is pulled in after the DOM has loaded
+    $('[data-tooltip="true"]').tooltip({
+        container: 'body',
+        animation: true,
+    });
+</script>