diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/transactionsMacros.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/transactionsMacros.ftl
index 544ae8cfc52b944ce156a9f454b1d94184dc3eaf..9902ec545c69d538e687a76bfb75061a838b02c5 100644
--- a/BudgetMasterServer/src/main/resources/templates/transactions/transactionsMacros.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/transactions/transactionsMacros.ftl
@@ -68,7 +68,7 @@
             </a>
             <ul class="new-transaction-button-list">
                 <li>
-                    <a href="<@s.url '/transactions/' + transaction.ID?c + '/edit'/>" class="btn-floating btn mobile-fab-tip no-wrap">${locale.getString("title.transaction.edit", locale.getString("title.transaction.new.normal"))}</a>
+                    <a href="<@s.url '/transactions/' + transaction.ID?c + '/edit'/>" class="btn-floating btn mobile-fab-tip no-wrap button-edit-all-occurrences">${locale.getString("title.transaction.edit", locale.getString("title.transaction.new.normal"))}</a>
                     <a href="<@s.url '/transactions/' + transaction.ID?c + '/edit'/>" class="btn-floating btn background-green-dark"><i class="material-icons">edit</i></a>
                 </li>
                 <li>
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionRecurringTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionRecurringTest.java
index 2103b80e37839f7eb5161009a945db15addb86a0..6f2892ed3b96011f498cc644cf6354f9bcbc70a8 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionRecurringTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionRecurringTest.java
@@ -75,7 +75,7 @@ class NewTransactionRecurringTest extends SeleniumTestBase
 			final String name = columns.get(2).findElement(By.className("transaction-text")).getText();
 			if(name.equals(TRANSACTION_NAME))
 			{
-				columns.get(4).findElements(By.tagName("a")).get(1).click();
+				columns.get(4).findElement(By.className("button-request-delete-transaction")).click();
 
 				WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(5));
 				wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector("#modalConfirmDelete .modal-content h4"), "Delete Entry"));
@@ -271,7 +271,12 @@ class NewTransactionRecurringTest extends SeleniumTestBase
 		TransactionTestHelper.assertTransactionColumns(columns, categoryName, "rgb(46, 124, 43)", true, true, TRANSACTION_NAME, description, amount);
 
 		// open transaction in edit view again
-		columns.get(4).findElement(By.cssSelector("a")).click();
+		columns.get(4).findElement(By.className("edit-transaction-button-link")).click();
+		final WebElement buttonEditFutureOccurrences = transactionRow.findElement(By.className("button-edit-all-occurrences"));
+		wait = new WebDriverWait(driver, Duration.ofSeconds(5));
+		wait.until(ExpectedConditions.visibilityOf(buttonEditFutureOccurrences));
+		buttonEditFutureOccurrences.click();
+
 		wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector(".headline"), "Edit " + type));
 
 		assertThat(driver.findElement(By.cssSelector(".account-select-wrapper .custom-select-selected-item .category-circle")).getAttribute("data-value")).isEqualTo("2");