diff --git a/src/ui/zcl_abapgit_html_form.clas.abap b/src/ui/zcl_abapgit_html_form.clas.abap
index 164c55999..3e0ac5241 100644
--- a/src/ui/zcl_abapgit_html_form.clas.abap
+++ b/src/ui/zcl_abapgit_html_form.clas.abap
@@ -285,6 +285,14 @@ CLASS ZCL_ABAPGIT_HTML_FORM IMPLEMENTATION.
 
     ri_html->add( |<div class="{ iv_form_class }">| ).
     ri_html->add( |<form method="post"{ ls_form_id }>| ).
+
+    " Add hidden button that triggers main command when pressing enter
+    LOOP AT mt_commands ASSIGNING <ls_cmd> WHERE is_main = abap_true.
+      ri_html->add( |<button type="submit" formaction="sapevent:{ <ls_cmd>-action
+                    }" class="hidden-submit" aria-hidden="true" tabindex="-1"></button>| ).
+      EXIT.
+    ENDLOOP.
+
     ri_html->add( |<ul>| ).
 
     LOOP AT mt_fields ASSIGNING <ls_field>.