diff --git a/packages/forms/src/components/WebForms.astro b/packages/forms/src/components/WebForms.astro
index ed594fe..c08d8ca 100644
--- a/packages/forms/src/components/WebForms.astro
+++ b/packages/forms/src/components/WebForms.astro
@@ -35,14 +35,25 @@ const clientScript = Astro.locals.forms.scriptToRun;
 <script>
     declare global {
         interface Window {
-            __CSEvent: (event: KeyboardEvent, id: string) => void;
+            __enterToSubmit: (event: KeyboardEvent, id: string) => void;
+            submitForm(value: HTMLElement | string): void;
         }
     }
 
-    window.__CSEvent = function(event, id) {
+    window.__enterToSubmit = function (event) {
         if (event.code === 'Enter') {
             event.preventDefault();
-            document.getElementById(id)?.click();
+            document.getElementById((event.target as HTMLElement).getAttribute('data-submit')!)?.click();
         }
-    }
+    };
+
+    window.submitForm = function (value: any) {
+        if (typeof value !== 'string') {
+            value = value.getAttribute('data-submit');
+        }
+        if(value == null){
+            return console.warn('submitForm: value is null, make sure you pass `this` to this method or an id of the button you want to submit.');
+        }
+        document.getElementById(value)?.click();
+    };
 </script>
diff --git a/packages/forms/src/form-tools/events.ts b/packages/forms/src/form-tools/events.ts
index f27cd88..e24a77c 100644
--- a/packages/forms/src/form-tools/events.ts
+++ b/packages/forms/src/form-tools/events.ts
@@ -1,5 +1,6 @@
 export function addOnSubmitClickEvent(buttonId?: string | false, allProps?: {[key: string]: string}){
     if(buttonId){
-        allProps.onkeypress = `__CSEvent(event, '${buttonId}');${allProps.onkeypress ?? ''}`;
+        allProps["data-submit"] = buttonId;
+        allProps.onkeypress = `__enterToSubmit(event)${allProps.onkeypress ? ';' + allProps.onkeypress : ''}`;
     }
 }
\ No newline at end of file