diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetRulePanel.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetRulePanel.java
index 4709a3986b..9ee7f1a172 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetRulePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetRulePanel.java
@@ -543,7 +543,9 @@ final class FilesSetRulePanel extends javax.swing.JPanel {
             this.mimeCheck.setSelected(false);
 
         } else {
-            this.extensionRadioButton.setEnabled(true);
+            if (this.nameCheck.isSelected()) {
+                this.extensionRadioButton.setEnabled(true);
+            }
             this.fileSizeCheck.setEnabled(true);
             this.mimeCheck.setEnabled(true);
         }
@@ -814,7 +816,9 @@ final class FilesSetRulePanel extends javax.swing.JPanel {
         } else {
             this.nameTextField.setEnabled(true);
             this.fullNameRadioButton.setEnabled(true);
-            this.extensionRadioButton.setEnabled(true);
+            if (this.filesRadioButton.isSelected()) {
+                this.extensionRadioButton.setEnabled(true);
+            }
             this.nameRegexCheckbox.setEnabled(true);
         }
         this.setOkButton();