diff --git a/app/assets/stylesheets/active_admin.scss b/app/assets/stylesheets/active_admin.scss
index e488a601f..a305ced1b 100644
--- a/app/assets/stylesheets/active_admin.scss
+++ b/app/assets/stylesheets/active_admin.scss
@@ -179,22 +179,17 @@ body.active_admin {
       }
     }
   }
+
+  // fixing max width issues with long select2 fields in the form
+  form .inputs ol {
+    max-width: calc(100vw - 100px);
+  }
 }
 
 .select2-container--default .select2-results__option[aria-disabled=true] {
   display: none;
 }
 
-
-// fixing layout issues https://github.com/activeadmin/activeadmin/issues/7667
-body.active_admin {
-  *,
-  *:before,
-  *:after {
-    box-sizing: unset;
-  }
-}
-
 // trying to revert this https://github.com/activeadmin/activeadmin/commit/7dd9bc89716603ba602985baf720c7d4623fbe07
 #title_bar {
   box-sizing: border-box;
diff --git a/app/assets/stylesheets/new_menu.scss b/app/assets/stylesheets/new_menu.scss
index 6fd484a20..02c13fb31 100644
--- a/app/assets/stylesheets/new_menu.scss
+++ b/app/assets/stylesheets/new_menu.scss
@@ -64,6 +64,7 @@ $skinTextColor: #1e2a33 !default;
       position: absolute;
       width: 200px;
       z-index: 1010;
+      box-sizing: content-box;
 
       a {
         background: none;