diff --git a/packages/main/src/MessageStripTemplateContext.js b/packages/main/src/MessageStripTemplateContext.js
index 0e62201dec4d..da07e08d06bf 100644
--- a/packages/main/src/MessageStripTemplateContext.js
+++ b/packages/main/src/MessageStripTemplateContext.js
@@ -8,7 +8,7 @@ class MessageStripTemplateContext {
"ui5-messagestrip-close-icon": true,
},
main: {
- "ui5-messagestrip": true,
+ "ui5-messagestrip-root": true,
"ui5-messagestrip-icon--hidden": state.hideIcon,
"ui5-messagestrip-close-icon--hidden": state.hideCloseButton,
[MessageStripTemplateContext.getTypeClasses(state)]: true,
diff --git a/packages/main/src/themes/MessageStrip.css b/packages/main/src/themes/MessageStrip.css
index a33b9300ac7c..1b9c5f0b8df8 100644
--- a/packages/main/src/themes/MessageStrip.css
+++ b/packages/main/src/themes/MessageStrip.css
@@ -14,7 +14,7 @@ span[data-sap-ui-wc-root] {
display: flex;
}
-.ui5-messagestrip {
+.ui5-messagestrip-root {
width: 100%;
height: 100%;
display: flex;
@@ -27,7 +27,7 @@ span[data-sap-ui-wc-root] {
position: relative;
}
-.ui5-messagestrip .ui5-messagestrip-icon {
+.ui5-messagestrip-root .ui5-messagestrip-icon {
width: var(--_ui5_messagestrip_icon_width);
box-sizing: border-box;
position: absolute;
@@ -35,13 +35,13 @@ span[data-sap-ui-wc-root] {
left: 0px;
}
-.ui5-messagestrip .ui5-messagestrip-text {
+.ui5-messagestrip -root.ui5-messagestrip-text {
width: 100%;
color: var(--sapTextColor);
line-height: 1.2;
}
-.ui5-messagestrip ui5-button {
+.ui5-messagestrip-root ui5-button {
height: var(--_ui5_messagestrip_button_height);
border-width: var(--_ui5_messagestrip_button_border_width);
border-style: var(--_ui5_messagestrip_button_border_style);
diff --git a/packages/main/test/sap/ui/webcomponents/main/samples/MessageStrip.sample.html b/packages/main/test/sap/ui/webcomponents/main/samples/MessageStrip.sample.html
index 20fe1a484fd5..fba4c49c3c32 100644
--- a/packages/main/test/sap/ui/webcomponents/main/samples/MessageStrip.sample.html
+++ b/packages/main/test/sap/ui/webcomponents/main/samples/MessageStrip.sample.html
@@ -21,6 +21,7 @@
}
+