diff --git a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricWidget/CustomMetricWidget.tsx b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricWidget/CustomMetricWidget.tsx
index 448adf563..fa1a4b168 100644
--- a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricWidget/CustomMetricWidget.tsx
+++ b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricWidget/CustomMetricWidget.tsx
@@ -75,9 +75,12 @@ function CustomMetricWidget(props: Props) {
   }, [period])
 
   const clickHandler = (event, index) => {
-    const timestamp = event.activePayload[0].payload.timestamp;
-    const { startTimestamp, endTimestamp } = getStartAndEndTimestampsByDensity(timestamp, period.start, period.end, params.density);
-    props.setActiveWidget({ widget: metric, startTimestamp, endTimestamp, timestamp: event.activePayload[0].payload.timestamp, index })
+    if (event) {
+      const payload = event.activePayload[0].payload;
+      const timestamp = payload.timestamp;
+      const { startTimestamp, endTimestamp } = getStartAndEndTimestampsByDensity(timestamp, period.start, period.end, params.density);
+      props.setActiveWidget({ widget: metric, startTimestamp, endTimestamp, timestamp: payload.timestamp, index })
+    }
   }
 
   const updateActiveState = (metricId, state) => {
diff --git a/frontend/app/components/shared/CustomMetrics/FilterSeries/SeriesName/SeriesName.tsx b/frontend/app/components/shared/CustomMetrics/FilterSeries/SeriesName/SeriesName.tsx
index 7d7d131ae..9ad4281c0 100644
--- a/frontend/app/components/shared/CustomMetrics/FilterSeries/SeriesName/SeriesName.tsx
+++ b/frontend/app/components/shared/CustomMetrics/FilterSeries/SeriesName/SeriesName.tsx
@@ -1,4 +1,3 @@
-import { edit } from 'App/components/ui/ItemMenu/itemMenu.css';
 import React, { useState, useRef, useEffect } from 'react';
 import { Icon } from 'UI';
 
diff --git a/frontend/app/duck/customMetrics.js b/frontend/app/duck/customMetrics.js
index 8d7b49deb..91ace5b42 100644
--- a/frontend/app/duck/customMetrics.js
+++ b/frontend/app/duck/customMetrics.js
@@ -131,12 +131,14 @@ export function fetch(id) {
 	}
 }
 
-export function save(instance) {
-  return {
+export const save = (instance) => (dispatch, getState) => {
+  return dispatch({
     types: SAVE.array,
     call: client => client.post( `/${ instance.exists() ? name + 's/' + instance[idKey] : name + 's'}`, instance.toSaveData()),
-  };
-}
+  }).then(() => {
+    dispatch(fetchList());
+  });
+};
 
 export function fetchList() {
   return {