diff --git a/addons/web/static/src/core/model_field_selector/model_field_selector.js b/addons/web/static/src/core/model_field_selector/model_field_selector.js
index c108b2a1b3a..df7279cb023 100644
--- a/addons/web/static/src/core/model_field_selector/model_field_selector.js
+++ b/addons/web/static/src/core/model_field_selector/model_field_selector.js
@@ -91,7 +91,7 @@ export class ModelFieldSelector extends Component {
             },
             {
                 closeOnClickAway: true,
-                popoverClass: "o-popover-no-arrow",
+                popoverClass: "o_popover_field_selector",
             }
         );
     }
diff --git a/addons/web/static/src/legacy/scss/model_field_selector.scss b/addons/web/static/src/legacy/scss/model_field_selector.scss
index 9520641b0a5..7b493998fb9 100644
--- a/addons/web/static/src/legacy/scss/model_field_selector.scss
+++ b/addons/web/static/src/legacy/scss/model_field_selector.scss
@@ -1,5 +1,5 @@
 
-.o_field_selector {
+.o_legacy_field_selector {
     position: relative;
 
     > .o_field_selector_value {
@@ -41,7 +41,7 @@
         }
     }
 }
-.o_field_selector_popover {
+.o_legacy_field_selector_popover {
     $o-field-selector-arrow-height: 7px;
     @include o-position-absolute();
     z-index: 1051;