diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
index 33d2e63374..e18f9b917d 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesChildren.java
@@ -29,7 +29,7 @@ import org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent;
 /**
  * Makes nodes for common files search results.
  */
-class CommonFilesChildren extends Children.Keys<AbstractFile> {
+final class CommonFilesChildren extends Children.Keys<AbstractFile> {
 
     CommonFilesChildren(boolean lazy, List<AbstractFile> fileList) {
         super(lazy);
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesDialog.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesDialog.java
index daa0249966..4a1e3d849a 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesDialog.java
@@ -27,7 +27,7 @@ import org.openide.windows.WindowManager;
 /**
  * Dialog box for configuring and running common files search.
  */
-public class CommonFilesDialog extends javax.swing.JDialog {
+public final class CommonFilesDialog extends javax.swing.JDialog {
 
     /**
      * Creates new form CommonFilesDialog
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java
index 4f5bec75c9..fac0d0858a 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesNode.java
@@ -26,7 +26,7 @@ import org.sleuthkit.datamodel.AbstractFile;
 /**
  * Encapsulates data used to display common files search results in the top right pane.
  */
-class CommonFilesNode extends AbstractNode {
+final class CommonFilesNode extends AbstractNode {
 
     private CommonFilesChildren children;
 
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
index 8ecdbe39c9..11fb49406d 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
@@ -37,7 +37,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  * Panel used for common files search configuration and configuration business logic.
  * Nested within CommonFilesDialog.
  */
-public class CommonFilesPanel extends javax.swing.JPanel {
+public final class CommonFilesPanel extends javax.swing.JPanel {
 
     private static final long serialVersionUID = 1L;