diff --git a/_tests/FocusLock.spec.js b/_tests/FocusLock.spec.js
index 90b8316..3fb3a13 100644
--- a/_tests/FocusLock.spec.js
+++ b/_tests/FocusLock.spec.js
@@ -650,10 +650,23 @@ text
         expect(document.activeElement.innerHTML).to.be.equal('action');
       });
 
+      it('MoveFocusInside works with non-tabbable elements', () => {
+        mount(<FocusLock>
+          <MoveFocusInside>
+            <div>
+              text
+              <button tabIndex={-1}>action</button>
+              text
+            </div>
+          </MoveFocusInside>
+        </FocusLock>);
+        expect(document.activeElement.innerHTML).to.be.equal('action');
+      });
+
       it('FocusLock do nothing', () => {
         mount(<FocusLock autoFocus={false}>
           <div>
-text
+            text
             <button>action</button>
             text
           </div>
diff --git a/package.json b/package.json
index 6a6c75f..afc622f 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
   "homepage": "https://github.com/theKashey/react-focus-lock#readme",
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "focus-lock": "^0.6.7",
+    "focus-lock": "^0.7.0",
     "prop-types": "^15.6.2",
     "react-clientside-effect": "^1.2.2",
     "use-callback-ref": "^1.2.1",
diff --git a/yarn.lock b/yarn.lock
index 0a32481..3a69de7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5377,6 +5377,11 @@ focus-lock@^0.6.7:
   resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.6.8.tgz#61985fadfa92f02f2ee1d90bc738efaf7f3c9f46"
   integrity sha512-vkHTluRCoq9FcsrldC0ulQHiyBYgVJB2CX53I8r0nTC6KnEij7Of0jpBspjt3/CuNb6fyoj3aOh9J2HgQUM0og==
 
+focus-lock@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.7.0.tgz#b2bfb0ca7beacc8710a1ff74275fe0dc60a1d88a"
+  integrity sha512-LI7v2mH02R55SekHYdv9pRHR9RajVNyIJ2N5IEkWbg7FT5ZmJ9Hw4mWxHeEUcd+dJo0QmzztHvDvWcc7prVFsw==
+
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"