diff --git a/awx/ui/client/src/partials/survey-maker-modal.html b/awx/ui/client/src/partials/survey-maker-modal.html
index b8f56cadcc..1be3cd5d39 100644
--- a/awx/ui/client/src/partials/survey-maker-modal.html
+++ b/awx/ui/client/src/partials/survey-maker-modal.html
@@ -22,7 +22,7 @@
     <div class="SurveyMaker-header">
         <div class="SurveyMaker-title">
             <div class="SurveyMaker-titleText">{{name || "New Job Template"}}<div class="SurveyMaker-titleLockup"></div>SURVEY</div>
-            <div class="ScheduleToggle" ng-class="{'is-on': survey_enabled}" aw-tool-tip="surveyEnabledTooltip" data-placement="right" data-tip-watch="surveyEnabledTooltip">
+            <div class="ScheduleToggle" ng-class="{'is-on': survey_enabled}" aw-tool-tip="surveyEnabledTooltip" data-container="#survey-modal-dialog" data-placement="right" data-tip-watch="surveyEnabledTooltip">
                 <button ng-show="survey_enabled" class="ScheduleToggle-switch is-on" ng-click="toggleSurveyEnabled()" translate>ON</button>
                 <button ng-show="!survey_enabled" class="ScheduleToggle-switch" ng-click="toggleSurveyEnabled()" translate>OFF</button>
             </div>
@@ -56,17 +56,17 @@
                                     <i>{{question.question_description}}</i>
                                 </div>
                                 <div class="SurveyMaker-previewInputRow">
-                                    <span dnd-handle class="SurveyMaker-reorderButton" data-placement="top" aw-tool-tip="Drag to reorder question" data-original-title="" title="" ng-show="(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)">
+                                    <span dnd-handle class="SurveyMaker-reorderButton" data-placement="top" aw-tool-tip="Drag to reorder question" data-container="#survey-modal-dialog" data-original-title="" title="" ng-show="(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)">
                                         <i class="fa fa-ellipsis-v"></i>
                                         <span>&nbsp;</span>
                                         <i class="fa fa-ellipsis-v"></i>
                                     </span>
                                     <survey-question class="SurveyMaker-previewInput" preview="true" question="question" ng-required="question.required" ng-disabled=true></survey-question>
                                     <div class="SurveyMaker-previewActions" ng-show="(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)">
-                                        <button class="List-actionButton" data-placement="top" ng-class="{'SurveyMaker-previewActions--selected' : editQuestionIndex == $index}" ng-click="editQuestion($index)" aw-tool-tip="Edit question" data-original-title="" title="">
+                                        <button class="List-actionButton" data-placement="top" ng-class="{'SurveyMaker-previewActions--selected' : editQuestionIndex == $index}" ng-click="editQuestion($index)" aw-tool-tip="Edit question" data-container="#survey-modal-dialog" data-original-title="" title="">
                                             <i class="fa fa-pencil"></i>
                                         </button>
-                                        <button class="List-actionButton List-actionButton--delete" data-placement="top" ng-click="showDeleteQuestion($index)" aw-tool-tip="Delete question" data-original-title="" title="">
+                                        <button class="List-actionButton List-actionButton--delete" data-placement="top" ng-click="showDeleteQuestion($index)" aw-tool-tip="Delete question" data-container="#survey-modal-dialog" data-original-title="" title="">
                                             <i class="fa fa-trash-o"></i>
                                         </button>
                                     </div>
diff --git a/awx/ui/client/src/shared/directives.js b/awx/ui/client/src/shared/directives.js
index 445352fef3..64f542c1d8 100644
--- a/awx/ui/client/src/shared/directives.js
+++ b/awx/ui/client/src/shared/directives.js
@@ -804,6 +804,7 @@ function(ConfigurationUtils, i18n, $rootScope) {
         link: function(scope, element, attrs) {
             var delay = { show: 200, hide: 0 },
                 placement,
+                container,
                 stateChangeWatcher;
             if (attrs.awTipPlacement) {
                 placement = attrs.awTipPlacement;
@@ -811,6 +812,8 @@ function(ConfigurationUtils, i18n, $rootScope) {
                 placement = (attrs.placement !== undefined && attrs.placement !== null) ? attrs.placement : 'left';
             }
 
+            container = attrs.container ? attrs.container : 'body';
+
             var template, custom_class;
             if (attrs.tooltipInnerClass || attrs.tooltipinnerclass) {
                 custom_class = attrs.tooltipInnerClass || attrs.tooltipinnerclass;
@@ -849,7 +852,7 @@ function(ConfigurationUtils, i18n, $rootScope) {
                 delay: delay,
                 html: true,
                 title: attrs.awToolTip,
-                container: 'body',
+                container: container,
                 trigger: 'hover',
                 template: template
             });
diff --git a/awx/ui/grunt-tasks/watch.js b/awx/ui/grunt-tasks/watch.js
index a9cf2a2fcc..e2a6c4e55c 100644
--- a/awx/ui/grunt-tasks/watch.js
+++ b/awx/ui/grunt-tasks/watch.js
@@ -6,7 +6,8 @@ module.exports = {
     partials: {
         files: [
             'client/lib/components/**/*.partial.html',
-            'client/src/**/*.partial.html'
+            'client/src/**/*.partial.html',
+            'client/src/partials/*.html'
         ],
         tasks: ['newer:copy:partials']
     },