diff --git a/packages/main/src/ComboBox.hbs b/packages/main/src/ComboBox.hbs
index 6f18badef003..e9099f20c46f 100644
--- a/packages/main/src/ComboBox.hbs
+++ b/packages/main/src/ComboBox.hbs
@@ -23,6 +23,7 @@
aria-describedby="{{valueStateTextId}}"
aria-label="{{ariaLabelText}}"
aria-required="{{required}}"
+ data-sap-focus-ref
/>
{{#if icon}}
diff --git a/packages/main/test/pages/ComboBox.html b/packages/main/test/pages/ComboBox.html
index e6ec96b390d8..f3fdb039a6b5 100644
--- a/packages/main/test/pages/ComboBox.html
+++ b/packages/main/test/pages/ComboBox.html
@@ -54,6 +54,7 @@
@@ -276,6 +277,10 @@