diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 0fef537dfb..c522bf3865 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -192,5 +192,4 @@
 		</overflow-menu>
 	</div>
 	<div class="ui tabs divider"></div>
-	{{template "repo/watch_options_modal" $}}
 </div>
diff --git a/templates/repo/header/watch.tmpl b/templates/repo/header/watch.tmpl
index a662878595..df6b716d0e 100644
--- a/templates/repo/header/watch.tmpl
+++ b/templates/repo/header/watch.tmpl
@@ -28,3 +28,4 @@
 	</a>
 	{{end}}
 </div>
+{{template "repo/watch_options_modal" $}}
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index cc73bdf13c..06958974e1 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -13,7 +13,7 @@
 		</h2>
 		{{template "base/alert" .}}
 
-		<form class="ui form" action="{{.Link}}" method="post" data-global-init="initReleaseEditForm"
+		<form class="ui form" action="{{.Link}}" id="new-release" method="post" data-global-init="initReleaseEditForm"
 			data-existing-tags="{{JsonUtils.EncodeToString .Tags}}"
 			data-tag-helper="{{ctx.Locale.Tr "repo.release.tag_helper"}}"
 			data-tag-helper-new="{{ctx.Locale.Tr "repo.release.tag_helper_new"}}"
diff --git a/templates/repo/watch_options_modal.tmpl b/templates/repo/watch_options_modal.tmpl
index 6248e52416..e46667bb84 100644
--- a/templates/repo/watch_options_modal.tmpl
+++ b/templates/repo/watch_options_modal.tmpl
@@ -2,7 +2,7 @@
 	<div class="header">{{ctx.Locale.Tr "notifications"}}</div>
 	<div class="content">
 		<p>{{ctx.Locale.Tr "repo.watch.options.desc"}}</p>
-		<form class="ui form form-fetch-action" method="post">
+		<form class="ui form" method="post">
 			<div class="field">
 				<div class="ui checkbox">
 					<input name="pull_requests" type="checkbox"><label>{{ctx.Locale.Tr "repo.watch.options.pull_requests"}}</label>
diff --git a/templates/shared/repo/list.tmpl b/templates/shared/repo/list.tmpl
index 353c2b7d75..69b263ce61 100644
--- a/templates/shared/repo/list.tmpl
+++ b/templates/shared/repo/list.tmpl
@@ -65,7 +65,6 @@
 							>
 								{{svg "octicon-gear"}}
 							</a>
-							{{template "repo/watch_options_modal"}}
 						{{end}}
 					</div>
 				</div>
@@ -88,4 +87,5 @@
 		{{ctx.Locale.Tr "search.no_results"}}
 	</div>
 	{{end}}
+	{{template "repo/watch_options_modal"}}
 </div>
diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go
index ba15f8962e..b98ebb3e32 100644
--- a/tests/integration/issue_test.go
+++ b/tests/integration/issue_test.go
@@ -127,7 +127,7 @@ func testNewIssue(t *testing.T, session *TestSession, user, repo, title, content
 	resp := session.MakeRequest(t, req, http.StatusOK)
 
 	htmlDoc := NewHTMLParser(t, resp.Body)
-	link, exists := htmlDoc.doc.Find("form.ui.form").Attr("action")
+	link, exists := htmlDoc.doc.Find("form#new-issue").Attr("action")
 	assert.True(t, exists, "The template has changed")
 	req = NewRequestWithValues(t, "POST", link, map[string]string{
 		"title":   title,
diff --git a/tests/integration/pull_create_test.go b/tests/integration/pull_create_test.go
index 48e8c96d38..c6a24b3a20 100644
--- a/tests/integration/pull_create_test.go
+++ b/tests/integration/pull_create_test.go
@@ -55,7 +55,7 @@ func testPullCreate(t *testing.T, session *TestSession, user, repo string, toSel
 
 	// Submit the form for creating the pull
 	htmlDoc = NewHTMLParser(t, resp.Body)
-	link, exists = htmlDoc.doc.Find("form.ui.form").Attr("action")
+	link, exists = htmlDoc.doc.Find("form#new-issue").Attr("action")
 	assert.True(t, exists, "The template has changed")
 	req = NewRequestWithValues(t, "POST", link, map[string]string{
 		"title": title,
@@ -98,7 +98,7 @@ func testPullCreateDirectly(t *testing.T, session *TestSession, opts createPullR
 
 	// Submit the form for creating the pull
 	htmlDoc := NewHTMLParser(t, resp.Body)
-	link, exists := htmlDoc.doc.Find("form.ui.form").Attr("action")
+	link, exists := htmlDoc.doc.Find("form#new-issue").Attr("action")
 	assert.True(t, exists, "The template has changed")
 	params := map[string]string{
 		"title": opts.Title,
@@ -125,7 +125,7 @@ func testPullCreateFailure(t *testing.T, session *TestSession, baseRepoOwner, ba
 
 	// Submit the form for creating the pull
 	htmlDoc := NewHTMLParser(t, resp.Body)
-	link, exists := htmlDoc.doc.Find("form.ui.form").Attr("action")
+	link, exists := htmlDoc.doc.Find("form#new-issue").Attr("action")
 	assert.True(t, exists, "The template has changed")
 	req = NewRequestWithValues(t, "POST", link, map[string]string{
 		"title": title,
diff --git a/tests/integration/release_test.go b/tests/integration/release_test.go
index de86a3f348..c85da74b7d 100644
--- a/tests/integration/release_test.go
+++ b/tests/integration/release_test.go
@@ -24,7 +24,7 @@ func createNewRelease(t *testing.T, session *TestSession, repoURL, tag, title st
 	resp := session.MakeRequest(t, req, http.StatusOK)
 	htmlDoc := NewHTMLParser(t, resp.Body)
 
-	link, exists := htmlDoc.doc.Find("form.ui.form").Attr("action")
+	link, exists := htmlDoc.doc.Find("form#new-release").Attr("action")
 	assert.True(t, exists, "The template has changed")
 
 	postData := map[string]string{