diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartSettings.java b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartSettings.java
index d4177402a7c2ac5b1edaca5e82c4fd1aa51dc4e7..aac9e2d9fb6f00fa6e8537fe2db7800b4d93dc97 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartSettings.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartSettings.java
@@ -56,12 +56,12 @@ public class ChartSettings
 		this.groupType = groupType;
 	}
 
-	public int getChartID()
+	public Integer getChartID()
 	{
 		return chartID;
 	}
 
-	public void setChartID(int chartID)
+	public void setChartID(Integer chartID)
 	{
 		this.chartID = chartID;
 	}
diff --git a/src/main/resources/static/js/charts.js b/src/main/resources/static/js/charts.js
index ba94c935e5807f4d9ec4e827063cbfb3e3b3d24d..896d50c8a05e3123347c06826ac493cfcd73b5fc 100644
--- a/src/main/resources/static/js/charts.js
+++ b/src/main/resources/static/js/charts.js
@@ -81,13 +81,13 @@ $(document).ready(function()
     {
         toggleChartTypeButtons('button-display-type', this);
         hideGroupTypeButtonsIfOnlyOneDistinctGroup();
-        filterChartPreviews();
+        filterChartPreviews(-1);
     });
 
     $('.button-group-type').click(function()
     {
         toggleChartTypeButtons('button-group-type', this);
-        filterChartPreviews();
+        filterChartPreviews(-1);
     });
 
     $('.chart-preview-column').click(function()
@@ -115,12 +115,13 @@ $(document).ready(function()
         applyFilter();
     });
 
-    $('#buttonShowChartSettings').click(function(){
+    $('#buttonShowChartSettings').click(function()
+    {
         document.getElementsByName('NewChartSettings')[0].classList.toggle('hidden', false);
         document.getElementById('buttonShowChartSettings').classList.toggle('hidden', true);
     });
 
-    filterChartPreviews();
+    filterChartPreviews(selectChartID);
 
     let showEditSettingsButton = document.getElementsByName('NewChartSettings')[0].classList.contains('hidden');
     document.getElementById('buttonShowChartSettings').classList.toggle('hidden', !showEditSettingsButton);
@@ -266,7 +267,7 @@ function toggleChartTypeButtons(styleClassName, item)
 function hideGroupTypeButtonsIfOnlyOneDistinctGroup()
 {
     let displayTypeName = document.querySelector('.button-display-type.active').dataset.value;
-    let chartsWithCurrentDisplayType = document.querySelectorAll('.chart-preview-column[data-display-type="' + displayTypeName +'"]');
+    let chartsWithCurrentDisplayType = document.querySelectorAll('.chart-preview-column[data-display-type="' + displayTypeName + '"]');
 
     let groupTypes = new Set();
     for(let i = 0; i < chartsWithCurrentDisplayType.length; i++)
@@ -278,7 +279,7 @@ function hideGroupTypeButtonsIfOnlyOneDistinctGroup()
     document.getElementById('chart-group-type-buttons').classList.toggle('hidden', hasOnlyOneDistinctGroupType);
 }
 
-function filterChartPreviews()
+function filterChartPreviews(initiallySelectedChartID)
 {
     let displayTypeName = document.querySelector('.button-display-type.active').dataset.value;
     let groupTypeName = document.querySelector('.button-group-type.active').dataset.value;
@@ -308,16 +309,17 @@ function filterChartPreviews()
         }
     }
 
-    unsetActiveChartPreview();
+    unsetActiveChartPreview(initiallySelectedChartID);
     toggleCustomChartButton(displayTypeName === 'CUSTOM');
 }
 
-function unsetActiveChartPreview()
+function unsetActiveChartPreview(initiallySelectedChartID)
 {
-    let allChartPreviews = document.getElementsByClassName('chart-preview');
-    for(let i = 0; i < allChartPreviews.length; i++)
+    let allChartPreviewColumns = document.getElementsByClassName('chart-preview-column');
+    for(let i = 0; i < allChartPreviewColumns.length; i++)
     {
-        allChartPreviews[i].classList.toggle('active', false);
+        let column = allChartPreviewColumns[i];
+        column.querySelector('.chart-preview').classList.toggle('active', column.dataset.id === initiallySelectedChartID);
     }
 
     document.getElementsByName('chartID')[0].value = '';
diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl
index e28600489f0fa4b9a1ad3cd03a789abccef08830..a31298d04a382b163528ca3ec806f72c8d803138 100644
--- a/src/main/resources/templates/charts/charts.ftl
+++ b/src/main/resources/templates/charts/charts.ftl
@@ -68,6 +68,10 @@
                         </div>
                         <input type="hidden" name="chartID" value="">
 
+                        <script>
+                            selectChartID="${chartSettings.getChartID()!-1}";
+                        </script>
+
                         <@dateSelect/>
 
                         <@filterOptions/>