diff --git a/src/app/shared/components/radio-option/radio-option.component.html b/src/app/shared/components/radio-option/radio-option.component.html
index 5b6c4ce9505cedd6a0d10abfd15ae1456ed53aa9..c5477d582720b82fb1724ae3600b344333d7cfbf 100644
--- a/src/app/shared/components/radio-option/radio-option.component.html
+++ b/src/app/shared/components/radio-option/radio-option.component.html
@@ -1,4 +1,4 @@
-<button type="button" tabindex="0" [ngClass]="{ selected: selected }" (click)="clicked()">
+<div class="radioContainer" tabindex="-1" [ngClass]="{ selected: selected }" (click)="clicked()" (keydown)="clicked()">
   <app-radio
     [id]="id"
     [checked]="selected === true"
@@ -7,4 +7,4 @@
     [size]="size"
     [iconName]="iconName"
   />
-</button>
+</div>
diff --git a/src/app/shared/components/radio-option/radio-option.component.scss b/src/app/shared/components/radio-option/radio-option.component.scss
index 5cb67f795e1238d7411937096c91f03c3546b77f..d92e6912383bf567b599fa0ad67e67e7d5d8f11c 100644
--- a/src/app/shared/components/radio-option/radio-option.component.scss
+++ b/src/app/shared/components/radio-option/radio-option.component.scss
@@ -1,6 +1,6 @@
 @import 'color';
 
-button {
+.radioContainer {
   width: 100%;
   cursor: pointer;
   box-sizing: border-box;
diff --git a/src/app/shared/components/radio/radio.component.html b/src/app/shared/components/radio/radio.component.html
index 6d0da5a2e978eabbf03ca0563d25c2411bd77d89..2ce3ca4e9c33a9f94a10085035ca2463c9abf956 100644
--- a/src/app/shared/components/radio/radio.component.html
+++ b/src/app/shared/components/radio/radio.component.html
@@ -1,12 +1,12 @@
 <div class="radioContainer">
   <input
     type="radio"
-    tabindex="-1"
     [id]="id"
     [checked]="checked"
     [disabled]="disabled"
     [ngClass]="classes"
     (click)="action.emit($event)"
+    (keydown)="action.emit($event)"
   />
   <app-svg-icon *ngIf="iconName" [iconClass]="'icon-44'" [folder]="'form'" [icon]="iconName" />
   <div class="details">