diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index 31b8a03bc5..40424b8185 100644
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -59,11 +59,11 @@
 			</form>
 		</div>
 		<div class="actions">
-			<button class="ui small basic cancel button">
+			<button class="ui cancel button">
 				{{svg "octicon-x"}}
 				{{ctx.Locale.Tr "cancel"}}
 			</button>
-			<button class="ui primary small approve button">
+			<button class="ui primary ok button">
 				{{svg "fontawesome-save"}}
 				{{ctx.Locale.Tr "save"}}
 			</button>
diff --git a/tests/e2e/repo-labels.test.e2e.ts b/tests/e2e/repo-labels.test.e2e.ts
index e7d5ce32bf..ef33e91dda 100644
--- a/tests/e2e/repo-labels.test.e2e.ts
+++ b/tests/e2e/repo-labels.test.e2e.ts
@@ -21,10 +21,10 @@ test('New label', async ({page}) => {
   await screenshot(page, page.locator('#new-label-modal'));
 
   const labelName = dynamic_id();
-  await page.keyboard.type(labelName);
+  await page.getByRole('textbox', {name: 'Label name'}).fill(labelName);
   await page.getByRole('button', {name: 'Create label'}).click();
 
-  await page.locator('.label-title').filter({hasText: labelName}).isVisible();
+  await expect(page.locator('.label-title').filter({hasText: labelName})).toBeVisible();
 });
 
 test('Edit label', async ({page}) => {
@@ -36,8 +36,8 @@ test('Edit label', async ({page}) => {
   await screenshot(page, page.locator('#edit-label-modal'));
 
   const labelName = dynamic_id();
-  await page.keyboard.type(labelName);
+  await page.getByRole('textbox', {name: 'Label name'}).fill(labelName);
   await page.getByRole('button', {name: 'Save'}).click();
 
-  await page.locator('.label-title').filter({hasText: labelName}).isVisible();
+  await expect(page.locator('.label-title').filter({hasText: labelName})).toBeVisible();
 });