diff --git a/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java b/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
index 171366e..e0ece27 100644
--- a/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
+++ b/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
@@ -154,7 +154,7 @@ public class DirectoryEntry extends EntryWithChildren<Entry> {
                     File f = new File(file, name);
                     String type = props.getProperty("file." + name + ".type", "image");
                     FileEntry entry = new FileEntry(this, f, type);
-                    Thumbnail thumbnail = new Thumbnail(f);
+                    Thumbnail thumbnail = new Thumbnail(f, type);
                     entry.setCaption(props.getProperty("file." + name + ".caption"));
                     Date fileDate = sdf.parse(props.getProperty("file." + name + ".captureDate"));
                     if (fileDate.before(oldest)) {
diff --git a/src/main/java/org/forkalsrud/album/exif/Thumbnail.java b/src/main/java/org/forkalsrud/album/exif/Thumbnail.java
index 37d7a0a..89c817c 100644
--- a/src/main/java/org/forkalsrud/album/exif/Thumbnail.java
+++ b/src/main/java/org/forkalsrud/album/exif/Thumbnail.java
@@ -16,10 +16,12 @@ public class Thumbnail {
     int orientation;
     String etag;
     String duration;
+    String type;
 
 
-    public Thumbnail(File path) {
+    public Thumbnail(File path, String type) {
     	this.path = path;
+    	this.type = type;
     }
 
     /**
@@ -76,4 +78,8 @@ public class Thumbnail {
     public void setDuration(String duration) {
         this.duration = duration;
     }
+
+    public String getType() {
+        return type;
+    }
 }
diff --git a/src/main/webapp/WEB-INF/velocity/dynamic.vm b/src/main/webapp/WEB-INF/velocity/dynamic.vm
index 3b73167..9d9f7d6 100644
--- a/src/main/webapp/WEB-INF/velocity/dynamic.vm
+++ b/src/main/webapp/WEB-INF/velocity/dynamic.vm
@@ -108,7 +108,7 @@ $D(function() {
 			var gridDiv = $("<div class=\"grid\">\n"
 				    + "   <span class=\"name\">" + entry.name + "</span><br/>\n"
 				    + "   <div class=\"imgborder\"><a class=\"ss\" id=\"ent" + idx + "\" href=\"${base}" + entry.path + "?size=" + picSize + "\" title=\"" + entry.name + "\">"
-				    + "<img class=\"picture\" src=\"${base}" + (entry.type == "movie" ? entry.path + ".frame" : entry.path) + "?size=" + thmb + "\" border=\"0\" width=\"" + dim.w + "\" height=\"" + dim.h + "\"/></a></div>\n"
+				    + "<img class=\"picture\" src=\"${base}" + (entry.thumbtype == "movie" ? entry.path + ".frame" : entry.path) + "?size=" + thmb + "\" border=\"0\" width=\"" + dim.w + "\" height=\"" + dim.h + "\"/></a></div>\n"
 				    + "</div>\n");
 
             var captionP = $("<p id=\"" + entry.name + "\" class=\"caption\"></p>\n");