diff --git a/slick/slick.js b/slick/slick.js
index b30b47469..6a2a09953 100644
--- a/slick/slick.js
+++ b/slick/slick.js
@@ -1354,7 +1354,11 @@
         }
 
         for (var i=_.currentSlide, max=i+_.options.slidesToShow; i < max; i++) {
-            _.$slides.eq(i).attr('tabindex', 0);
+          if (_.options.focusOnChange) {
+            _.$slides.eq(i).attr({'tabindex': '0'});
+          } else {
+            _.$slides.eq(i).removeAttr('tabindex');
+          }
         }
 
         _.activateADA();