diff --git a/src/vaadin-combo-box-dropdown-wrapper.html b/src/vaadin-combo-box-dropdown-wrapper.html
index 969d2652d..606616699 100644
--- a/src/vaadin-combo-box-dropdown-wrapper.html
+++ b/src/vaadin-combo-box-dropdown-wrapper.html
@@ -28,7 +28,6 @@
       }
     </style>
     <vaadin-combo-box-dropdown id="dropdown"
-        opened="{{opened}}"
         hidden="[[_hidden(_items.*, loading)]]"
         position-target="[[positionTarget]]"
         on-template-changed="_templateChanged"
@@ -142,7 +141,7 @@
       }
 
       static get observers() {
-        return ['_selectorChanged(_selector)', '_loadingChanged(loading)'];
+        return ['_selectorChanged(_selector)', '_loadingChanged(loading)', '_openedChanged(opened)', '_itemsChanged(_items)'];
       }
 
       _fireTouchAction(sourceEvent) {
@@ -151,6 +150,16 @@
         }));
       }
 
+      _openedChanged(opened) {
+        this.$.dropdown.opened = !!(opened && this._items && this._items.length);
+      }
+
+      _itemsChanged(items) {
+        if (this.opened && !this.$.dropdown.opened && items && items.length) {
+          this.$.dropdown.opened = true;
+        }
+      }
+
       ready() {
         super.ready();
         // IE11: when scrolling with mouse, the focus goes to the scroller.
diff --git a/src/vaadin-combo-box-mixin.html b/src/vaadin-combo-box-mixin.html
index 9d9079796..5c27ac265 100644
--- a/src/vaadin-combo-box-mixin.html
+++ b/src/vaadin-combo-box-mixin.html
@@ -261,8 +261,11 @@
             this.focus();
           }
         }
-      } else if (this._openedWithFocusRing && this.hasAttribute('focused')) {
-        this.focusElement.setAttribute('focus-ring', '');
+      } else {
+        if (this._openedWithFocusRing && this.hasAttribute('focused')) {
+          this.focusElement.setAttribute('focus-ring', '');
+        }
+        this._onClosed();
       }
     }
 
diff --git a/test/overlay-position.html b/test/overlay-position.html
index f49f23ebd..93aa0e72a 100644
--- a/test/overlay-position.html
+++ b/test/overlay-position.html
@@ -17,7 +17,7 @@
 
 <test-fixture id='combobox'>
   <template>
-    <vaadin-combo-box label='combobox' style='width: 300px'></vaadin-combo-box>
+    <vaadin-combo-box label='combobox' style='width: 300px' items='[1]'></vaadin-combo-box>
   </template>
 </test-fixture>
 
diff --git a/test/toggling-dropdown.html b/test/toggling-dropdown.html
index eceab24a7..5b8e4a441 100644
--- a/test/toggling-dropdown.html
+++ b/test/toggling-dropdown.html
@@ -308,7 +308,7 @@
       });
 
       it('dropdown should not be shown when disabled', () => {
-        combobox.inputElement.dispatchEvent(new CustomEvent('click'));
+        combobox.inputElement.dispatchEvent(new CustomEvent('click', {bubbles: true, composed: true}));
         expect(combobox.opened).to.be.false;
       });
     });
@@ -328,7 +328,17 @@
       });
 
       it('dropdown should not be shown when read-only', () => {
-        combobox.inputElement.dispatchEvent(new CustomEvent('click'));
+        combobox.inputElement.dispatchEvent(new CustomEvent('click', {bubbles: true, composed: true}));
+        expect(combobox.opened).to.be.false;
+      });
+    });
+
+    describe('empty list', () => {
+      it('dropdown should not be shown when filteredItems is empty', () => {
+        combobox.filteredItems = null;
+        expect(combobox.opened).to.be.false;
+
+        combobox.filteredItems = [];
         expect(combobox.opened).to.be.false;
       });
     });