diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
index 85247f5a01..e8960df89f 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
@@ -402,15 +402,11 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
     }//GEN-LAST:event_documentsCheckboxActionPerformed
 
     private void intraCaseRadioActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_intraCaseRadioActionPerformed
-        ((java.awt.CardLayout)this.layoutPanel.getLayout()).first(this.layoutPanel);
-//        this.intraCasePanel.setVisible(true);
-//        this.interCasePanel.setVisible(false);
+        ((java.awt.CardLayout)this.layoutPanel.getLayout()).last(this.layoutPanel);
     }//GEN-LAST:event_intraCaseRadioActionPerformed
 
     private void interCaseRadioActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_interCaseRadioActionPerformed
-        ((java.awt.CardLayout)this.layoutPanel.getLayout()).last(this.layoutPanel);
-//        this.intraCasePanel.setVisible(false);
-//        this.interCasePanel.setVisible(true);
+        ((java.awt.CardLayout)this.layoutPanel.getLayout()).first(this.layoutPanel);
     }//GEN-LAST:event_interCaseRadioActionPerformed
 
     private void toggleErrorTextAndSearchBox() {
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCasePanel.form b/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCasePanel.form
index adb18f764c..6e93e118cf 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCasePanel.form
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCasePanel.form
@@ -59,6 +59,9 @@
           <ResourceString bundle="org/sleuthkit/autopsy/commonfilesearch/Bundle.properties" key="InterCasePanel.anCentralRepoCaseRadio.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="anCentralRepoCaseRadioActionPerformed"/>
+      </Events>
     </Component>
     <Component class="javax.swing.JRadioButton" name="specificCentralRepoCaseRadio">
       <Properties>
@@ -69,6 +72,9 @@
           <ResourceString bundle="org/sleuthkit/autopsy/commonfilesearch/Bundle.properties" key="InterCasePanel.specificCentralRepoCaseRadio.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="specificCentralRepoCaseRadioActionPerformed"/>
+      </Events>
     </Component>
     <Component class="javax.swing.JComboBox" name="caseComboBox">
       <Properties>
@@ -80,6 +86,7 @@
             <StringItem index="3" value="Item 4"/>
           </StringArray>
         </Property>
+        <Property name="enabled" type="boolean" value="false"/>
       </Properties>
       <AuxValues>
         <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCasePanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCasePanel.java
index 13067a8551..1d82c0974f 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCasePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCasePanel.java
@@ -49,11 +49,22 @@ public class InterCasePanel extends javax.swing.JPanel {
         buttonGroup.add(anCentralRepoCaseRadio);
         anCentralRepoCaseRadio.setSelected(true);
         org.openide.awt.Mnemonics.setLocalizedText(anCentralRepoCaseRadio, org.openide.util.NbBundle.getMessage(InterCasePanel.class, "InterCasePanel.anCentralRepoCaseRadio.text")); // NOI18N
+        anCentralRepoCaseRadio.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                anCentralRepoCaseRadioActionPerformed(evt);
+            }
+        });
 
         buttonGroup.add(specificCentralRepoCaseRadio);
         org.openide.awt.Mnemonics.setLocalizedText(specificCentralRepoCaseRadio, org.openide.util.NbBundle.getMessage(InterCasePanel.class, "InterCasePanel.specificCentralRepoCaseRadio.text")); // NOI18N
+        specificCentralRepoCaseRadio.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                specificCentralRepoCaseRadioActionPerformed(evt);
+            }
+        });
 
         caseComboBox.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        caseComboBox.setEnabled(false);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
@@ -82,6 +93,14 @@ public class InterCasePanel extends javax.swing.JPanel {
         );
     }// </editor-fold>//GEN-END:initComponents
 
+    private void specificCentralRepoCaseRadioActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_specificCentralRepoCaseRadioActionPerformed
+        this.caseComboBox.setEnabled(true);
+    }//GEN-LAST:event_specificCentralRepoCaseRadioActionPerformed
+
+    private void anCentralRepoCaseRadioActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_anCentralRepoCaseRadioActionPerformed
+        this.caseComboBox.setEnabled(false);
+    }//GEN-LAST:event_anCentralRepoCaseRadioActionPerformed
+
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JRadioButton anCentralRepoCaseRadio;