diff --git a/src/evidently/ui/dashboards/test_suites.py b/src/evidently/ui/dashboards/test_suites.py
index e49d39b4ef..cea5c97da2 100644
--- a/src/evidently/ui/dashboards/test_suites.py
+++ b/src/evidently/ui/dashboards/test_suites.py
@@ -198,7 +198,10 @@ def get_z_value(test, date) -> float:
             ],
             layout={"showlegend": True},
         )
+
         fig.update_yaxes(showticklabels=False)
+        fig.update_xaxes(type="category")
+
         return fig
 
 
diff --git a/ui/packages/evidently-ui-lib/src/widgets/BigGraphWidgetContent.tsx b/ui/packages/evidently-ui-lib/src/widgets/BigGraphWidgetContent.tsx
index 4c8353fa63..76d146e3c8 100644
--- a/ui/packages/evidently-ui-lib/src/widgets/BigGraphWidgetContent.tsx
+++ b/ui/packages/evidently-ui-lib/src/widgets/BigGraphWidgetContent.tsx
@@ -33,7 +33,7 @@ const BigGraphWidgetContent: React.FunctionComponent<BigGraphWidgetProps> = (pro
   const [isHovered, setIsHovered] = useState<boolean>(false)
 
   const lineOnClickedPoint: Partial<Shape>[] =
-    OnClickComponent && clickEvent && props.data.every((e) => e.type !== 'heatmap')
+    OnClickComponent && clickEvent
       ? [
           {
             type: 'line',