diff --git a/awx/ui/client/legacy/styles/ansible-ui.less b/awx/ui/client/legacy/styles/ansible-ui.less
index a85621fd9b..6b8b788c4c 100644
--- a/awx/ui/client/legacy/styles/ansible-ui.less
+++ b/awx/ui/client/legacy/styles/ansible-ui.less
@@ -21,12 +21,6 @@
     src: url(/static/assets/OpenSans-Bold.ttf);
 }
 
-/* Bootstrap fix that's causing a right margin to appear
-   whenver a modal is opened */
-body.modal-open {
-  margin-right: 0;
-}
-
 /* Helper Classes */
 .pad-right-sm { padding-right: 10px; }
 .pad-left-md { padding-left: 30px; }
diff --git a/awx/ui/client/legacy/styles/bootstrap-custom-overrides.less b/awx/ui/client/legacy/styles/bootstrap-custom-overrides.less
index 06a652cedc..ab6020ce86 100644
--- a/awx/ui/client/legacy/styles/bootstrap-custom-overrides.less
+++ b/awx/ui/client/legacy/styles/bootstrap-custom-overrides.less
@@ -4,6 +4,13 @@ body {
     color: @default-data-txt;
     background-color: @default-secondary-bg;
     font-size: 0.88rem;
+    /*
+    * Bootstrap fix that's causing a right margin and padding
+    * to appear whenever a modal is opened
+    * https://github.com/twbs/bootstrap/issues/27071
+    */
+    margin-right: 0px !important;
+    padding-right: 0px !important;
 }
 
 .dropdown-toggle::after {