diff --git a/BudgetMasterServer/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties
index 5242b87130ded3241feddb5b4efb5e4fe81a31a0..4fc5f02c795a6981203656de601a1801e97956b2 100644
--- a/BudgetMasterServer/src/main/resources/languages/base_de.properties
+++ b/BudgetMasterServer/src/main/resources/languages/base_de.properties
@@ -365,6 +365,7 @@ transaction.new.label.repeating.all=Alle
 
 repeating.button.add=Wiederholung hinzufügen
 repeating.button.remove=Wiederholung entfernen
+repeating.button.edit.future=Diese und zukünftige Wiederholungen editieren
 
 repeating.modifier.days=Tage
 repeating.modifier.months=Monate
diff --git a/BudgetMasterServer/src/main/resources/languages/base_en.properties b/BudgetMasterServer/src/main/resources/languages/base_en.properties
index 1bbe6c93dfcaa2c1b4fc32b4fe4c8c91fddd137b..adcdae5d25eb99b8f5ab36e95d6bde24eca34ea7 100644
--- a/BudgetMasterServer/src/main/resources/languages/base_en.properties
+++ b/BudgetMasterServer/src/main/resources/languages/base_en.properties
@@ -365,6 +365,7 @@ transaction.new.label.repeating.all=Every
 
 repeating.button.add=Add repetition
 repeating.button.remove=Remove repetition
+repeating.button.edit.future=Edit this and future occurrences
 
 repeating.modifier.days=Days
 repeating.modifier.months=Months
diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl
index cce06b1ae5da9e973a564012170341b298069194..fcadb6ad14deda49b639d537c9d3b842b654d5cb 100644
--- a/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl
@@ -160,7 +160,7 @@
     </script>
 </#macro>
 
-<#macro transactionRepeating transaction currentDate>
+<#macro transactionRepeating transaction currentDate isEdit>
     <div class="row <#if transaction.isRepeating()>hidden</#if>">
         <div class="col s12 center-align">
             <@header.buttonLink url='' icon='repeat' localizationKey='repeating.button.add' id='button-transaction-add-repeating-option' color='background-blue-baby' noUrl=true classes="text-black"/>
@@ -187,6 +187,20 @@
             <@header.buttonLink url='' icon='delete' localizationKey='repeating.button.remove' id='button-transaction-remove-repeating-option' color='background-blue-baby' noUrl=true classes="text-black hidden"/>
         </div>
     </div>
+
+    <div class="row">
+        <div class="col s12 center-align">
+            <#if isEdit && transaction.isRepeating()>
+                <#assign buttonEditFutureClasses='text-black'/>
+            <#else>
+                <#assign buttonEditFutureClasses='text-black hidden'/>
+            </#if>
+
+            <#if isEdit>
+                <@header.buttonLink url='/transactions/' + transaction.ID?c + '/editFutureRepetitions' icon='move_up' localizationKey='repeating.button.edit.future' id='button-transaction-edit-future-occurrences' color='background-blue-baby' classes="${buttonEditFutureClasses}"/>
+            </#if>
+        </div>
+    </div>
 </#macro>
 
 <#macro repeatingModifier transaction>
diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionNormal.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionNormal.ftl
index c529aaa42442ccf7b000bf1055981797d2c99919..4f5321a95316b1eb4d9d37a3041814fe4400fcd3 100644
--- a/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionNormal.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionNormal.ftl
@@ -73,7 +73,7 @@
                             <@customSelectMacros.customAccountSelect "account-select-wrapper" "account" accounts selectedAccount "col s12 m12 l8 offset-l2" locale.getString("transaction.new.label.account") "transaction-account"/>
 
                             <#-- repeating options -->
-                            <@newTransactionMacros.transactionRepeating transaction currentDate/>
+                            <@newTransactionMacros.transactionRepeating transaction currentDate isEdit/>
 
                             <#-- buttons -->
                             <@newTransactionMacros.buttons cancelURL='/transactions' includeContinueButton=true/>
diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionTransfer.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionTransfer.ftl
index 3ef2b5821fb76eb230398c65eaff29b994bd346d..b1f96bc1aab5b4b7545b2a997eadc47fc0593c97 100644
--- a/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionTransfer.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionTransfer.ftl
@@ -79,7 +79,7 @@
                             <@customSelectMacros.customAccountSelect "transfer-account-select-wrapper" "transferAccount" accounts selectedTransferAccount "col s12 m12 l8 offset-l2" locale.getString("transaction.new.label.transfer.account") "transaction-destination-account"/>
 
                             <#-- repeating options -->
-                            <@newTransactionMacros.transactionRepeating transaction currentDate/>
+                            <@newTransactionMacros.transactionRepeating transaction currentDate isEdit/>
 
                             <#-- buttons -->
                             <@newTransactionMacros.buttons cancelURL='/transactions' includeContinueButton=true/>