diff --git a/src/vaadin-checkbox.html b/src/vaadin-checkbox.html
index 3ebba83..090d755 100644
--- a/src/vaadin-checkbox.html
+++ b/src/vaadin-checkbox.html
@@ -266,8 +266,9 @@
});
}
+ /** @protected */
get focusElement() {
- return this.shadowRoot.querySelector('label');
+ return this.shadowRoot.querySelector('input');
}
/**
diff --git a/test/vaadin-checkbox_test.html b/test/vaadin-checkbox_test.html
index 896dbbb..f8fa858 100644
--- a/test/vaadin-checkbox_test.html
+++ b/test/vaadin-checkbox_test.html
@@ -85,6 +85,10 @@
expect(children[2].outerHTML).to.be.equal('Checkbox');
});
+ it('should have input as focusElement', () => {
+ expect(vaadinCheckbox.focusElement).to.be.eql(nativeCheckbox);
+ });
+
it('can be disabled imperatively', () => {
vaadinCheckbox.disabled = true;
expect(nativeCheckbox.hasAttribute('disabled')).to.be.eql(true);