diff --git a/test/vaadin-list-mixin.html b/test/vaadin-list-mixin.html
index c62d657..97f8876 100644
--- a/test/vaadin-list-mixin.html
+++ b/test/vaadin-list-mixin.html
@@ -136,6 +136,26 @@
     </template>
   </test-fixture>
 
+  <test-fixture id="list-disabled">
+    <template>
+      <test-list-element>
+        <test-item-element disabled>Item 0</test-item-element>
+        <test-item-element disabled>Item 1</test-item-element>
+        <test-item-element>Item 2</test-item-element>
+        <test-item-element>Item 3</test-item-element>
+      </test-list-element>
+    </template>
+  </test-fixture>
+
+  <test-fixture id="list-all-disabled">
+    <template>
+      <test-list-element>
+        <test-item-element disabled>Item 0</test-item-element>
+        <test-item-element disabled>Item 1</test-item-element>
+      </test-list-element>
+    </template>
+  </test-fixture>
+
   <script>
     function arrowDown(target) {
       MockInteractions.keyDownOn(target, 40, [], 'ArrowDown');
@@ -253,27 +273,42 @@
       });
 
       describe('tabIndex', () => {
-        it('should set tabIndex=-1 to all items, but the first', done => {
-          Polymer.RenderStatus.afterNextRender(list, () => {
-            [0, -1, -1, -1].forEach((val, idx) => expect(list.items[idx].tabIndex).to.be.equal(val));
-            done();
-          });
+        beforeEach(() => {
+          list = fixture('list-disabled');
+          list._observer.flush();
         });
 
-        it('should move tabIndex when moving focus', () => {
-          list._focus(3);
-          [-1, -1, -1, 0].forEach((val, idx) => expect(list.items[idx].tabIndex).to.be.equal(val));
+        it('should have the first not disabled item focusable by default', () => {
+          [-1, -1, 0, -1].forEach((val, idx) => expect(list.items[idx].tabIndex).to.equal(val));
         });
 
-        it('should not set tabIndex=0 to disabled items, but the next one in the loop', () => {
-          list._focus(2);
-          [-1, -1, -1, 0].forEach((val, idx) => expect(list.items[idx].tabIndex).to.be.equal(val));
+        it('should set a not disabled item focusable', () => {
+          list._setFocusable(3);
+          [-1, -1, -1, 0].forEach((val, idx) => expect(list.items[idx].tabIndex).to.equal(val));
         });
 
-        it('should have a `focus()` method focusing item with `tabIndex=0`', done => {
+        it('should not set a disabled item focusable but the next not disabled item instead', () => {
+          list._setFocusable(1);
+          [-1, -1, 0, -1].forEach((val, idx) => expect(list.items[idx].tabIndex).to.equal(val));
+        });
+
+        it('should call focus() method on the item when setting it focusable', () => {
           list._setFocusable(3);
-          list.items[3].focus = () => done();
+          const spy = sinon.spy(list.items[3], 'focus');
           list.focus();
+          expect(spy.calledOnce).to.be.true;
+        });
+      });
+
+      describe('tabIndex when all the items are disabled', () => {
+        beforeEach(() => {
+          list = fixture('list-all-disabled');
+          list._observer.flush();
+        });
+
+        it('should not have any item focusable', () => {
+          expect(list.items[0].tabIndex).to.equal(-1);
+          expect(list.items[1].tabIndex).to.equal(-1);
         });
       });
 
diff --git a/vaadin-list-mixin.html b/vaadin-list-mixin.html
index 41d378f..884cbf9 100644
--- a/vaadin-list-mixin.html
+++ b/vaadin-list-mixin.html
@@ -105,7 +105,7 @@
             item.updateStyles();
           });
 
-          this._setFocusable(selected);
+          this._setFocusable(selected || 0);
 
           const itemToSelect = items[selected];
           items.forEach(item => item.selected = item === itemToSelect);
@@ -269,7 +269,7 @@
      */
     _setFocusable(idx) {
       idx = this._getAvailableIndex(idx, 1, item => !item.disabled);
-      const item = this.items[idx] || this.items[0];
+      const item = this.items[idx];
       this.items.forEach(e => e.tabIndex = e === item ? 0 : -1);
     }