diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
index e3c4b62cb7..cc6f917fad 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
@@ -904,7 +904,7 @@
                             content: tooltip,
                             position: {
                                 target: 'mouse',
-                                viewport: $(window),
+                                viewport: $('#shell-container'),
                                 adjust: {
                                     x: 8,
                                     y: 8,
@@ -934,7 +934,7 @@
                             content: tooltip,
                             position: {
                                 target: 'mouse',
-                                viewport: $(window),
+                                viewport: $('#shell-container'),
                                 adjust: {
                                     x: 8,
                                     y: 8,
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
index e214ca8e3f..9af798869b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
@@ -949,7 +949,7 @@
                             content: tooltip,
                             position: {
                                 target: 'mouse',
-                                viewport: $(window),
+                                viewport: $('#shell-container'),
                                 adjust: {
                                     x: 8,
                                     y: 8,
@@ -979,7 +979,7 @@
                             content: tooltip,
                             position: {
                                 target: 'mouse',
-                                viewport: $(window),
+                                viewport: $('#shell-container'),
                                 adjust: {
                                     x: 8,
                                     y: 8,