diff --git a/src/frontend/components/form-group/input/_input.scss b/src/frontend/components/form-group/input/_input.scss
index 34f59f476..6b17fd48a 100644
--- a/src/frontend/components/form-group/input/_input.scss
+++ b/src/frontend/components/form-group/input/_input.scss
@@ -43,6 +43,7 @@
 
 .input--required label:not(.checkbox-label)::after {
   content: "*";
+  color: $brand-danger;
 }
 
 .input--required.input--file .input__label > label::after {
diff --git a/src/frontend/components/record-popup/lib/component.js b/src/frontend/components/record-popup/lib/component.js
index eb11ebef1..3e772a8c0 100644
--- a/src/frontend/components/record-popup/lib/component.js
+++ b/src/frontend/components/record-popup/lib/component.js
@@ -9,7 +9,16 @@ class RecordPopupComponent extends Component {
   }
 
   initRecordPopup() {
-    $(this.element).on('click', (ev) => { this.handleClick(ev) })
+    const $element = $(this.element);
+
+    $element.on('click keydown', (ev) => {
+      if (ev.type === 'click' || (ev.type === 'keydown' && (ev.which === 13 || ev.which === 32))) {
+        const $button = $(ev.target).closest('tr').find('.trigger');
+        if (!($button.is(ev.target))) {
+          this.handleClick(ev);
+        }
+      }
+    });
   }
 
   handleClick(ev) {