diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl
index ca97eb382d0f..d887d8ffae28 100644
--- a/templates/repo/wiki/new.tmpl
+++ b/templates/repo/wiki/new.tmpl
@@ -11,7 +11,7 @@
 				</div>
 			{{end}}
 		</div>
-		<form id="edit_form" class="ui form" action="{{.Link}}" method="post">
+		<form class="ui form" action="{{.Link}}" method="post">
 			{{.CsrfTokenHtml}}
 			<div class="field {{if .Err_Title}}error{{end}}">
 				<input name="title" value="{{.title}}" autofocus required>
diff --git a/web_src/js/features/repo-wiki.js b/web_src/js/features/repo-wiki.js
index 24c9d479e9cd..1acdb4da48f1 100644
--- a/web_src/js/features/repo-wiki.js
+++ b/web_src/js/features/repo-wiki.js
@@ -8,7 +8,9 @@ export function initRepoWikiForm() {
   let sideBySideChanges = 0;
   let sideBySideTimeout = null;
   let hasSimpleMDE = true;
+
   if ($editArea.length > 0) {
+    const $form = $('.repository.wiki.new .ui.form');
     const simplemde = new SimpleMDE({
       autoDownloadFontAwesome: false,
       element: $editArea[0],
@@ -105,7 +107,6 @@ export function initRepoWikiForm() {
           action(e) {
             e.toTextArea();
             hasSimpleMDE = false;
-            const $form = $('.repository.wiki.new .ui.form');
             const $root = $form.find('.field.content');
             const loading = $root.data('loading');
             $root.append(`<div class="ui bottom tab markup" data-tab="preview">${loading}</div>`);
@@ -117,23 +118,24 @@ export function initRepoWikiForm() {
       ]
     });
 
-    $('#edit_form').on('submit', (e) => {
+    const $markdownEditorTextArea = $(simplemde.codemirror.getInputField());
+    $markdownEditorTextArea.addClass('js-quick-submit');
+
+    $form.on('submit', function (e) {
       // The original edit area HTML element is hidden and replaced by the
       // SimpleMDE editor, breaking HTML5 input validation if the text area is empty.
       // This is a workaround for this upstream bug.
       // See https://github.com/sparksuite/simplemde-markdown-editor/issues/324
-      const input = $editArea.val()
+      const input = $editArea.val();
       if (!input.length) {
-        $(simplemde.codemirror.getInputField()).attr('required', true);
-        document.querySelector('#edit_form').reportValidity();
-        e.preventDefault()
+        e.preventDefault();
+        $markdownEditorTextArea.prop('required', true);
+        this.reportValidity();
       } else {
-        $(simplemde.codemirror.getInputField()).attr('required', false);
+        $markdownEditorTextArea.prop('required', false);
       }
     });
 
-    $(simplemde.codemirror.getInputField()).addClass('js-quick-submit');
-
     setTimeout(() => {
       const $bEdit = $('.repository.wiki.new .previewtabs a[data-tab="write"]');
       const $bPrev = $('.repository.wiki.new .previewtabs a[data-tab="preview"]');