diff --git a/src/components/charts/CandleChart.vue b/src/components/charts/CandleChart.vue
index 5010e677..d251f27b 100644
--- a/src/components/charts/CandleChart.vue
+++ b/src/components/charts/CandleChart.vue
@@ -45,26 +45,22 @@ export default class CandleChart extends Vue {
 
   @Prop({ required: true }) plotConfig!: PlotConfig;
 
-  // Only recalculate buy / sell data if necessary
-  signalsCalculated = false;
-
   buyData = [] as Array<number>[];
 
   sellData = [] as Array<number>[];
 
   chartOptions: echarts.EChartOption = {};
 
-  @Watch('timeframe')
-  timeframeChanged() {
-    this.signalsCalculated = false;
-  }
-
   @Watch('dataset')
   datasetChanged() {
-    this.signalsCalculated = false;
     this.updateChart();
   }
 
+  @Watch('plotConfig')
+  plotConfigChanged() {
+    this.initializeChartOptions();
+  }
+
   get strategy() {
     return this.dataset ? this.dataset.strategy : '';
   }
@@ -107,6 +103,7 @@ export default class CandleChart extends Vue {
       useUTC: this.useUTC,
       animation: false,
       legend: {
+        // Initial legend, further entries are pushed to the below list
         data: ['Candles', 'Volume', 'Buy', 'Sell'],
         right: '1%',
       },