diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
index 8c36ad7359..e50590775b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
@@ -414,7 +414,7 @@ public class WAttachment extends Window implements EventListener<Event>
 	public void displaySelected() {
 		MAttachmentEntry entry = m_attachment.getEntry(displayIndex);
 		if (log.isLoggable(Level.CONFIG)) log.config("Index=" + displayIndex + " - " + entry);
-		if (entry != null && entry.getData() != null)
+		if (entry != null && entry.getData() != null && autoPreviewList.contains(entry.getContentType()))
 		{
 			if (log.isLoggable(Level.CONFIG)) log.config(entry.toStringX());