diff --git a/src/renderer/component/Button/regularButton.js b/src/renderer/component/Button/regularButton.js
index 60de852fd..01e212465 100644
--- a/src/renderer/component/Button/regularButton.js
+++ b/src/renderer/component/Button/regularButton.js
@@ -18,7 +18,7 @@
 import React from "react";
 import PropTypes from "prop-types";
 
-const RegularButton = ({ selected, onClick, size, buttonText, style, icoSVG, icoPosition, disabled }) => {
+const RegularButton = ({ selected, onClick, size, buttonText, style, icoSVG, icoPosition, disabled, tabIndex }) => {
   return (
     <div
       onClick={disabled ? () => {} : onClick}
@@ -26,6 +26,7 @@ const RegularButton = ({ selected, onClick, size, buttonText, style, icoSVG, ico
         icoPosition ? icoPosition : "None"
       }`}
       disabled={disabled}
+      tabIndex={tabIndex}
     >
       <div className={"buttonLabel"}>
         {icoSVG && icoPosition !== "right" ? icoSVG : ""}
diff --git a/src/renderer/modules/KeyPickerKeyboard/KeyPickerReduced.js b/src/renderer/modules/KeyPickerKeyboard/KeyPickerReduced.js
index cb832f9dc..0e0da142e 100644
--- a/src/renderer/modules/KeyPickerKeyboard/KeyPickerReduced.js
+++ b/src/renderer/modules/KeyPickerKeyboard/KeyPickerReduced.js
@@ -480,7 +480,7 @@ class KeyPickerReduced extends Component {
           icony={key.icony}
           iconsize={key.iconsize}
           disabled={key.mod == disableMods || key.move == disableMove || disableAll}
-          // disabled={false}
+          tabIndex={-1}
           idArray={key.idArray}
           keyCode={code}
         />
diff --git a/src/renderer/modules/Saving/Saving.js b/src/renderer/modules/Saving/Saving.js
index a1e951816..58685528e 100644
--- a/src/renderer/modules/Saving/Saving.js
+++ b/src/renderer/modules/Saving/Saving.js
@@ -27,6 +27,7 @@ const Saving = ({ saveContext, destroyContext, inContext }) => {
   return (
     <Style className="savingButtons">
       <RegularButton
+        tabIndex={0}
         onClick={destroyContext}
         buttonText={i18n.app.cancelPending.button}
         style="outline"
@@ -34,6 +35,7 @@ const Saving = ({ saveContext, destroyContext, inContext }) => {
         disabled={!inContext}
       />
       <RegularButton
+        tabIndex={0}
         onClick={saveContext}
         buttonText={i18n.components.save.button}
         style="primary"