diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form
index 1defadefe8..9871cad4e0 100644
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form
+++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form
@@ -46,6 +46,7 @@
           <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessagesToolbar.ingestMessagesButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="alignmentX" type="float" value="0.5"/>
+        <Property name="enabled" type="boolean" value="false"/>
         <Property name="horizontalAlignment" type="int" value="2"/>
         <Property name="horizontalTextPosition" type="int" value="4"/>
         <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
index 2eb4a62d39..d9e75b036a 100644
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
+++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
@@ -23,6 +23,7 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import org.openide.windows.Mode;
 import org.openide.windows.WindowManager;
+import org.sleuthkit.autopsy.casemodule.Case;
 
 /**
  * Toolbar for Ingest
@@ -54,6 +55,7 @@ public class IngestMessagesToolbar extends javax.swing.JPanel {
         ingestMessagesButton.setText(org.openide.util.NbBundle.getMessage(IngestMessagesToolbar.class, "IngestMessagesToolbar.ingestMessagesButton.text")); // NOI18N
         ingestMessagesButton.setToolTipText(org.openide.util.NbBundle.getMessage(IngestMessagesToolbar.class, "IngestMessagesToolbar.ingestMessagesButton.toolTipText")); // NOI18N
         ingestMessagesButton.setAlignmentX(0.5F);
+        ingestMessagesButton.setEnabled(false);
         ingestMessagesButton.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
         ingestMessagesButton.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
         ingestMessagesButton.setMargin(new java.awt.Insets(1, 0, 1, 14));
@@ -97,6 +99,16 @@ public class IngestMessagesToolbar extends javax.swing.JPanel {
             }
             
         });
+        
+        Case.addPropertyChangeListener(new PropertyChangeListener() {
+
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                if(evt.getPropertyName().equals(Case.CASE_CURRENT_CASE))
+                    setEnabled(evt.getNewValue() != null);
+            }
+            
+        });
     }
 
     private void showIngestMessages() {
@@ -110,4 +122,10 @@ public class IngestMessagesToolbar extends javax.swing.JPanel {
             //tc.requestActive();   
         }
     }
+    
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        ingestMessagesButton.setEnabled(enabled);
+    }
 }