diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java
index 8a3fbdae88..3943ea94aa 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java
@@ -34,12 +34,16 @@ import javax.swing.SwingWorker;
 import org.openide.nodes.Node;
 import org.openide.util.Lookup;
 import org.openide.util.lookup.ServiceProvider;
+import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.contentviewers.Utilities;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContentViewer;
 import org.sleuthkit.autopsy.datamodel.ArtifactStringContent;
 import org.sleuthkit.datamodel.BlackboardArtifact;
+import org.sleuthkit.datamodel.BlackboardAttribute;
+import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.TskException;
+import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * Instances of this class display the BlackboardArtifacts associated with the Content represented by a Node.
@@ -471,7 +475,27 @@ public class DataContentViewerArtifact extends javax.swing.JPanel implements Dat
                 index = artifacts.indexOf(artifact);
                 if (index == -1) {
                     index = 0;
-                }
+                } else {
+                     SleuthkitCase skCase = Case.getCurrentCase().getSleuthkitCase();
+                    // if the artifact has an ASSOCIATED ARTIFACT, then we display the associated artifact instead
+                    try {
+                        for (BlackboardAttribute attr : artifact.getAttributes()) {
+                           if (attr.getAttributeTypeID() == BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT.getTypeID()) {
+                               long assocArtifactId = attr.getValueLong();
+                               BlackboardArtifact assocArtifact = skCase.getBlackboardArtifact(assocArtifactId);
+                               int assocArtifactIndex = artifacts.indexOf(assocArtifact);
+                               if (assocArtifactIndex >= 0) {
+                                    index = assocArtifactIndex;
+                                }
+                               break;
+                           }
+                        }
+                    } 
+                    catch (TskCoreException ex) {
+                        logger.log(Level.WARNING, "Couldn't get associated artifact to display in Content Viewer.", ex);
+                    }
+               }
+                    
             }        
 
             if (isCancelled()) {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index 0d43d81fbd..9b1a545bd1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -203,7 +203,8 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
                 final int attributeTypeID = attribute.getAttributeTypeID();
                 //skip some internal attributes that user shouldn't see
                 if (attributeTypeID == ATTRIBUTE_TYPE.TSK_PATH_ID.getTypeID()
-                        || attributeTypeID == ATTRIBUTE_TYPE.TSK_TAGGED_ARTIFACT.getTypeID()) {
+                        || attributeTypeID == ATTRIBUTE_TYPE.TSK_TAGGED_ARTIFACT.getTypeID()
+                        || attributeTypeID == ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT.getTypeID()) {
                     continue;
                 } else {
                     switch (attribute.getValueType()) {