diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 39ccda360f..274f7814ed 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -15,7 +15,7 @@
         <!--Array with repeatable items-->
         <div *ngIf="(!context.notRepeatable) && !isVirtual(context, index)"
              class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-            <button type="button" class="btn btn-secondary"
+            <button type="button" class="btn btn-secondary" role="button"
                     title="{{'form.remove' | translate}}"
                     (click)="removeItem($event, context, index)"
                     [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
@@ -24,7 +24,7 @@
         </div>
         <div *ngIf="(!context.notRepeatable) && index === (group.context.groups.length - 1)" class="clearfix pl-4 w-100">
           <div class="btn-group" role="group" aria-label="remove button">
-            <button type="button" class="ds-form-add-more btn btn-link"
+            <button type="button" role="button" class="ds-form-add-more btn btn-link"
                     title="{{'form.add' | translate}}"
                     [disabled]="isItemReadOnly(context, index)"
                     (click)="insertItem($event, group.context, group.context.groups.length)">
@@ -36,7 +36,7 @@
         <!--Array with non repeatable items - Only discard button-->
         <div *ngIf="context.notRepeatable && context.showButtons && group.context.groups.length > 1"
              class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-          <div class="btn-group" role="group" aria-label="Remove button">
+          <div class="btn-group" role="button" aria-label="Remove button">
             <button type="button" class="btn btn-secondary"
                     title="{{'form.discard' | translate}}"
                     (click)="removeItem($event, context, index)"
diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html
index 95727a1d2d..ec5585a937 100644
--- a/src/app/submission/sections/container/section-container.component.html
+++ b/src/app/submission/sections/container/section-container.component.html
@@ -12,7 +12,7 @@
                  [destroyOnHide]="false">
     <ngb-panel id="{{ sectionData.id }}">
       <ng-template ngbPanelTitle>
-        <span class="float-left">{{ 'submission.sections.'+sectionData.header | translate }}</span>
+        <span class="float-left section-title" tabindex="0">{{ 'submission.sections.'+sectionData.header | translate }}</span>
         <div class="d-inline-block float-right">
           <i *ngIf="!(sectionRef.isValid() | async) && !(sectionRef.hasErrors())" class="fas fa-exclamation-circle text-warning mr-3"
              aria-hidden="true"></i>
@@ -20,7 +20,7 @@
              aria-hidden="true"></i>
           <i *ngIf="(sectionRef.isValid() | async) && !(sectionRef.hasErrors())" class="fas fa-check-circle text-success mr-3"
              aria-hidden="true"></i>
-          <a class="close" aria-label="Close">
+          <a class="close" aria-label="Close" tabindex="0">
             <span *ngIf="sectionRef.isOpen()" class="fas fa-chevron-up fa-fw"
                   aria-hidden="true"></span>
             <span *ngIf="!sectionRef.isOpen()" class="fas fa-chevron-down fa-fw"
@@ -28,7 +28,7 @@
           </a>
           <a href="#" class="close mr-3" *ngIf="!sectionRef.isMandatory()"
              (click)="removeSection($event)">
-            <i class="fas fa-trash-o" aria-hidden="true"></i>
+            <i class="fas fa-trash-o" aria-hidden="true" tabindex="0"></i>
           </a>
         </div>
       </ng-template>