diff --git a/src/main/java/cokr/xit/base/file/web/DownloadView.java b/src/main/java/cokr/xit/base/file/web/DownloadView.java
index dde098d..e8518cb 100644
--- a/src/main/java/cokr/xit/base/file/web/DownloadView.java
+++ b/src/main/java/cokr/xit/base/file/web/DownloadView.java
@@ -103,6 +103,12 @@ public class DownloadView extends AbstractView {
 			FileInfo fileInfo = (FileInfo)obj;
 			return fileInfo.getName();
 		}
+
+		obj = model.get("download");
+		if (obj instanceof Downloadable) {
+			Downloadable downloadable = (Downloadable)obj;
+			return downloadable.getFilename();
+		}
 		return null;
 	}