diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
index 68a167b0bc..ef882bc01c 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
@@ -96,10 +96,12 @@ final class ReportVisualPanel2 extends JPanel {
             public void mousePressed(MouseEvent evt) {
 
                 int index = tagsList.locationToIndex(evt.getPoint());
-                String value = tagsModel.getElementAt(index);
-                tagStates.put(value, !tagStates.get(value));
-                tagsList.repaint();
-                updateFinishButton();
+                if (index < tagsModel.getSize() && index >= 0) {
+                    String value = tagsModel.getElementAt(index);
+                    tagStates.put(value, !tagStates.get(value));
+                    tagsList.repaint();
+                    updateFinishButton();
+                }
             }
         });
     }