1 files changed, 2 insertions, 2 deletions
diff --git a/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java
index 7aa4cbfc72..e68d606e67 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java
@@ -17,14 +17,14 @@ package com.vaadin.shared.ui.combobox;
 
 import com.vaadin.shared.annotations.DelegateToWidget;
 import com.vaadin.shared.annotations.NoLayout;
-import com.vaadin.shared.ui.TabIndexState;
+import com.vaadin.shared.ui.AbstractSingleSelectState;
 
 /**
  * Shared state for the ComboBox component.
  *
  * @since 7.0
  */
-public class ComboBoxState extends TabIndexState {
+public class ComboBoxState extends AbstractSingleSelectState {
     {
         // TODO ideally this would be v-combobox, but that would affect a lot of
         // themes