diff --git a/src/main/resources/static/js/charts.js b/src/main/resources/static/js/charts.js
index 3c0fae50ecb20e955e82bd54dd909bcc73ee33eb..ba94c935e5807f4d9ec4e827063cbfb3e3b3d24d 100644
--- a/src/main/resources/static/js/charts.js
+++ b/src/main/resources/static/js/charts.js
@@ -80,7 +80,6 @@ $(document).ready(function()
     $('.button-display-type').click(function()
     {
         toggleChartTypeButtons('button-display-type', this);
-        document.getElementsByName('displayType')[0].value = this.dataset.value;
         hideGroupTypeButtonsIfOnlyOneDistinctGroup();
         filterChartPreviews();
     });
@@ -88,7 +87,6 @@ $(document).ready(function()
     $('.button-group-type').click(function()
     {
         toggleChartTypeButtons('button-group-type', this);
-        document.getElementsByName('groupType')[0].value = this.dataset.value;
         filterChartPreviews();
     });
 
@@ -97,6 +95,8 @@ $(document).ready(function()
         unsetActiveChartPreview();
 
         this.querySelector('.chart-preview').classList.toggle('active', true);
+        document.getElementsByName('displayType')[0].value = this.dataset.displayType;
+        document.getElementsByName('groupType')[0].value = this.dataset.groupType;
         document.getElementsByName('chartID')[0].value = this.dataset.id;
         checkShowChartButton();
     });