diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties
index f06777022c805c1188bd6e2b191fd5280bab2e0e..cd214f8c585742024b44ba51e2d3ae983544f242 100644
--- a/src/main/resources/languages/base_de.properties
+++ b/src/main/resources/languages/base_de.properties
@@ -422,7 +422,7 @@ home.menu.templates=Vorlagen helfen dir dabei neue Buchung schnell und effizient
 home.menu.templates.action.manage=Vorlagenverwaltung
 
 home.menu.charts=Visualisiere deine Daten in verschiedenen Diagrammen. Nutze die mitgelieferten Diagrammtypen oder definiere deine eigenen Diagramme.
-home.menu.charts.action.manage=Diagrammverwaltung
+home.menu.charts.action.manage=Eigene Diagramme verwalten
 home.menu.charts.action.show=Diagramme ansehen
 
 home.menu.reports=Erstelle konfigurierbare Monatsberichte als PDF zum Ausdrucken und Archivieren. Du kannst den Inhalt der Berichte filtern und zum Beispiel nach Einnahmen und Ausgaben getrennt auflisten lassen.
diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties
index a08650762d271b852a3c0947ccd2535ff591ac27..5cdb728fb4d9334712ed42aee03e58b446b4fb37 100644
--- a/src/main/resources/languages/base_en.properties
+++ b/src/main/resources/languages/base_en.properties
@@ -423,7 +423,7 @@ home.menu.templates=Templates help you to create new transactions quickly and ef
 home.menu.templates.action.manage=Manage templates
 
 home.menu.charts=Visualize your data by using charts. You can choose an included default chart or define your own.
-home.menu.charts.action.manage=Manage charts
+home.menu.charts.action.manage=Manage custom charts
 home.menu.charts.action.show=Show charts
 
 home.menu.reports=Create configurable month reports in PDF format for printing and archiving. You can filter the content of the reports and, for example, list them separately to incomes and expenditures.
diff --git a/src/main/resources/static/js/charts.js b/src/main/resources/static/js/charts.js
index 1da6d0fd93d788d09197e21db641bae67ac66db9..760b548b412e5f368730b1c550a79d64dbd18da2 100644
--- a/src/main/resources/static/js/charts.js
+++ b/src/main/resources/static/js/charts.js
@@ -272,6 +272,8 @@ function filterChartPreviews()
     }
 
     unsetActiveChartPreview();
+
+    toggleCustomChartButton(displayTypeName === 'CUSTOM');
 }
 
 function unsetActiveChartPreview()
@@ -293,3 +295,8 @@ function checkShowChartButton()
     let selectedChartID = document.getElementsByName('chartID')[0].value;
     buttonShowChart.disabled = selectedChartID === '';
 }
+
+function toggleCustomChartButton(show)
+{
+    document.getElementById('buttonCustomCharts').classList.toggle('hidden', !show);
+}
diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl
index 1e9c1a25ecfcac77286520719d8afffa19cc5d78..d9d0951eb1dcb23a559e15a1da342bd425f96d27 100644
--- a/src/main/resources/templates/charts/charts.ftl
+++ b/src/main/resources/templates/charts/charts.ftl
@@ -26,8 +26,6 @@
 
                 <@header.content>
                     <br>
-<#--                    <div class="center-align"><@header.buttonLink url='/charts/manage' icon='edit' localizationKey='home.menu.charts.action.manage'/></div>-->
-<#--                    <br>-->
 
                     <form name="NewChartSettings" action="<@s.url '/charts'/>" method="post">
                         <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
@@ -59,6 +57,9 @@
                                 <#list charts as chart>
                                     <@chartPreview chart/>
                                 </#list>
+                                <div class="col s12 center-align hidden" id="buttonCustomCharts">
+                                    <@header.buttonLink url='/charts/manage' icon='edit' localizationKey='home.menu.charts.action.manage'/>
+                                </div>
                             </div>
                         </div>
                         <input type="hidden" name="chartID" value="">