diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index 66be0c143d..36de789dd1 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -128,9 +128,11 @@
 											</form>
 										</div>
 									</div>
-									<div id="commit-notes-add-button" class="item">
-										{{ctx.Locale.Tr "repo.diff.git-notes.add"}}
-									</div>
+									{{if not .NoteRendered}}
+										<div id="commit-notes-add-button" class="item">
+											{{ctx.Locale.Tr "repo.diff.git-notes.add"}}
+										</div>
+									{{end}}
 								</div>
 							</div>
 						{{end}}
diff --git a/tests/e2e/git-notes.test.e2e.ts b/tests/e2e/git-notes.test.e2e.ts
index 4245853b24..1e2cbe76fc 100644
--- a/tests/e2e/git-notes.test.e2e.ts
+++ b/tests/e2e/git-notes.test.e2e.ts
@@ -8,6 +8,9 @@ test('Change git note', async ({page}) => {
   let response = await page.goto('/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d');
   expect(response?.status()).toBe(200);
 
+  // An add button should not be present, because the commit already has a commit note
+  await expect(page.locator('#commit-notes-add-button')).toHaveCount(0);
+
   await page.locator('#commit-notes-edit-button').click();
 
   let textarea = page.locator('textarea[name="notes"]');