diff --git a/src/services/KeyboardNavigation/KeyboardNavigation.js b/src/services/KeyboardNavigation/KeyboardNavigation.js
index ea21d1740..2d947e0fb 100644
--- a/src/services/KeyboardNavigation/KeyboardNavigation.js
+++ b/src/services/KeyboardNavigation/KeyboardNavigation.js
@@ -21,6 +21,7 @@ function KeyboardNavigation() {
         }
 
         window.addEventListener('keydown', onKeyDown);
+        active = true;
     }
     function stop() {
         if (!active) {
@@ -28,6 +29,7 @@ function KeyboardNavigation() {
         }
 
         window.removeEventListener('keydown', onKeyDown);
+        active = false;
     }
 
     Object.defineProperties(this, {