diff --git a/packages/@coorpacademy-components/src/atom/input-text/index.js b/packages/@coorpacademy-components/src/atom/input-text/index.js
index a0e9b21800..7941c474ad 100644
--- a/packages/@coorpacademy-components/src/atom/input-text/index.js
+++ b/packages/@coorpacademy-components/src/atom/input-text/index.js
@@ -90,6 +90,7 @@ const InputText = props => {
           onChange={noop}
           data-name={dataName}
           aria-label={ariaLabel}
+          tabIndex={0}
         />
         {errorIconView}
         {validIconView}
diff --git a/packages/@coorpacademy-components/src/atom/input-textarea/index.js b/packages/@coorpacademy-components/src/atom/input-textarea/index.js
index 38d947159d..91a1598b4e 100644
--- a/packages/@coorpacademy-components/src/atom/input-textarea/index.js
+++ b/packages/@coorpacademy-components/src/atom/input-textarea/index.js
@@ -72,6 +72,7 @@ const InputTextarea = props => {
           onChange={handleChange}
           disabled={disabled}
           data-testid={name}
+          tabIndex={0}
         />
         {errorIconView}
         {validIconView}