diff --git a/src/kits/tracker/Model.cpp b/src/kits/tracker/Model.cpp
index 8a96c32d99..f68d6e0101 100644
--- a/src/kits/tracker/Model.cpp
+++ b/src/kits/tracker/Model.cpp
@@ -620,8 +620,11 @@ Model::FinishSettingUpType()
 			else if (strcmp(type, kVirtualDirectoryMimeType) == 0)
 				fBaseType = kVirtualDirectoryNode;
 
-			if (ShouldGenerateThumbnail(type))
+			attr_info thumb;
+			if (fNode->GetAttrInfo(kAttrThumbnail, &thumb) == B_OK
+				|| ShouldGenerateThumbnail(type)) {
 				fIconFrom = kNode;
+			}
 
 			if (info.GetPreferredApp(type) == B_OK) {
 				if (fPreferredAppName)