diff --git a/app/packages/core/src/plugins/SchemaIO/components/NativeModelEvaluationView/Evaluation.tsx b/app/packages/core/src/plugins/SchemaIO/components/NativeModelEvaluationView/Evaluation.tsx
index c3ee377dab..1d84c27aa4 100644
--- a/app/packages/core/src/plugins/SchemaIO/components/NativeModelEvaluationView/Evaluation.tsx
+++ b/app/packages/core/src/plugins/SchemaIO/components/NativeModelEvaluationView/Evaluation.tsx
@@ -1217,6 +1217,13 @@ export default function Evaluation(props: EvaluationProps) {
                             ].join(" <br>") + "<extra></extra>",
                         },
                       ]}
+                      onClick={({ points }) => {
+                        const firstPoint = points[0];
+                        loadView("matrix", {
+                          x: firstPoint.x,
+                          y: firstPoint.y,
+                        });
+                      }}
                       layout={{
                         yaxis: {
                           autorange: "reversed",
@@ -1598,7 +1605,7 @@ function useActiveFilter(evaluation, compareEvaluation) {
   const evalKey = evaluation?.info?.key;
   const compareKey = compareEvaluation?.info?.key;
   const [stages] = useRecoilState(view);
-  if (stages?.length === 1) {
+  if (stages?.length >= 1) {
     const stage = stages[0];
     const { _cls, kwargs } = stage;
     if (_cls.endsWith("FilterLabels")) {
diff --git a/fiftyone/operators/builtins/panels/model_evaluation/__init__.py b/fiftyone/operators/builtins/panels/model_evaluation/__init__.py
index 96684ce080..f9b1b147e9 100644
--- a/fiftyone/operators/builtins/panels/model_evaluation/__init__.py
+++ b/fiftyone/operators/builtins/panels/model_evaluation/__init__.py
@@ -420,7 +420,7 @@ def load_view(self, ctx):
         eval_key2 = view_state.get("compareKey", None)
         pred_field2 = None
         gt_field2 = None
-        if eval_key2 is not None:
+        if eval_key2:
             info2 = ctx.dataset.get_evaluation_info(eval_key2)
             pred_field2 = info2.config.pred_field
             if info2.config.gt_field != gt_field: