diff --git a/frontend/src/app/modules/common/help-texts/attribute-help-text.modal.ts b/frontend/src/app/modules/common/help-texts/attribute-help-text.modal.ts
index 3c18d1de5a..aec4e893d1 100644
--- a/frontend/src/app/modules/common/help-texts/attribute-help-text.modal.ts
+++ b/frontend/src/app/modules/common/help-texts/attribute-help-text.modal.ts
@@ -39,7 +39,7 @@ import {OpModalLocalsToken} from "core-components/op-modals/op-modal.service";
 export class AttributeHelpTextModal extends OpModalComponent {
 
   /* Close on escape? */
-  public closeOnEscape = false;
+  public closeOnEscape = true;
 
   /* Close on outside click */
   public closeOnOutsideClick = false;
diff --git a/frontend/src/app/modules/common/help-texts/help-text.modal.html b/frontend/src/app/modules/common/help-texts/help-text.modal.html
index d0d87786a7..344287d6cf 100644
--- a/frontend/src/app/modules/common/help-texts/help-text.modal.html
+++ b/frontend/src/app/modules/common/help-texts/help-text.modal.html
@@ -2,10 +2,10 @@
      data-indicator-name="modal">
   <div class="op-modal--modal-container attribute-help-text--modal" tabindex="0">
     <div class="op-modal--modal-header">
-      <a>
+      <a class="op-modal--modal-close-button">
         <i
           class="icon-close"
-          (click)="closeMe($event)"
+          (accessibleClick)="closeMe($event)"
           [attr.title]="text.close">
         </i>
       </a>