diff --git a/frontend/app/components/wp-edit/wp-edit-field/wp-edit-field.directive.ts b/frontend/app/components/wp-edit/wp-edit-field/wp-edit-field.directive.ts
index afe3161f83..74ffc34b0f 100644
--- a/frontend/app/components/wp-edit/wp-edit-field/wp-edit-field.directive.ts
+++ b/frontend/app/components/wp-edit/wp-edit-field/wp-edit-field.directive.ts
@@ -260,7 +260,15 @@ export class WorkPackageEditFieldController {
 
   protected updateDisplayAttributes() {
     this.__d__inplaceEditReadValue = this.__d__inplaceEditReadValue || this.$element.find(".__d__inplace-edit--read-value");
-    this.__d__inplaceEditReadValue.attr("tabindex", this.isEditable ? "0" : "-1");
+
+    if (this.isEditable) {
+      this.__d__inplaceEditReadValue.attr("role", "button");
+      this.__d__inplaceEditReadValue.attr("tabindex", "0");
+    }
+    else {
+      this.__d__inplaceEditReadValue.removeAttr("role");
+      this.__d__inplaceEditReadValue.removeAttr("tabindex");
+    }
   }
 }