diff --git a/frontend/app/components/Dashboard/components/MetricsList/GridView.tsx b/frontend/app/components/Dashboard/components/MetricsList/GridView.tsx
index 54c09e336..519e191f0 100644
--- a/frontend/app/components/Dashboard/components/MetricsList/GridView.tsx
+++ b/frontend/app/components/Dashboard/components/MetricsList/GridView.tsx
@@ -14,6 +14,7 @@ function GridView(props: Props) {
     const path = withSiteId(`/metrics/${metricId}`, siteId);
     history.push(path);
   };
+  
   return (
     <div className="grid grid-cols-4 gap-4 m-4 items-start">
       {list.map((metric: any) => (
@@ -22,8 +23,7 @@ function GridView(props: Props) {
             key={metric.metricId}
             widget={metric}
             active={selectedList.includes(metric.metricId)}
-            isTemplate={true}
-            isWidget={metric.metricType === 'predefined'}
+            isWidget={true}
             onClick={() => onItemClick(parseInt(metric.metricId))}
           />
         </React.Fragment>
diff --git a/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx b/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx
index aaa49ee38..4dfdeefc8 100644
--- a/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx
+++ b/frontend/app/components/Dashboard/components/WidgetWrapper/WidgetWrapper.tsx
@@ -1,6 +1,6 @@
 import React, { useRef } from 'react';
 import cn from 'classnames';
-import { ItemMenu, Tooltip, TextEllipsis } from 'UI';
+import { ItemMenu, TextEllipsis } from 'UI';
 import { useDrag, useDrop } from 'react-dnd';
 import WidgetChart from '../WidgetChart';
 import { observer } from 'mobx-react-lite';