diff --git a/src/utils/misc/hasFormSubmit.ts b/src/utils/misc/hasFormSubmit.ts
index 3e70d036..b8d456cb 100644
--- a/src/utils/misc/hasFormSubmit.ts
+++ b/src/utils/misc/hasFormSubmit.ts
@@ -1,8 +1,6 @@
 export const hasFormSubmit = (
   form: HTMLFormElement | null,
 ): form is HTMLFormElement =>
-  !!(
-    form &&
-    (form.querySelector('input[type="submit"]') ||
-      form.querySelector('button[type="submit"]'))
+  !!form?.querySelector(
+    'input[type="submit"], button:not([type]), button[type="submit"]',
   )
diff --git a/tests/keyboard/plugin/functional.ts b/tests/keyboard/plugin/functional.ts
index 5f8e0975..358c9e0c 100644
--- a/tests/keyboard/plugin/functional.ts
+++ b/tests/keyboard/plugin/functional.ts
@@ -96,11 +96,10 @@ cases(
       html: `<form><input/><input/><input type="submit"/></form>`,
       submit: true,
     },
-    // TODO: submit with button without type attribute
-    // 'with `<button/>`': {
-    //   html: `<form><input/><input/><button/></form>`,
-    //   submit: true,
-    // },
+    'with `<button/>`': {
+      html: `<form><input/><input/><button/></form>`,
+      submit: true,
+    },
     'with `<button type="submit"/>`': {
       html: `<form><input/><input/><button type="submit"/></form>`,
       submit: true,