diff --git a/templates/file_list.html b/templates/file_list.html
index 344d082..55c5b15 100644
--- a/templates/file_list.html
+++ b/templates/file_list.html
@@ -16,13 +16,14 @@
 											<a href="{{obj.in_dir[0].path_prefix}}/{{obj.name}}">
 										{% elif obj.type.name == "Video" %}
 											{% set icon="fa-film" %}
+											<a href="{{obj.in_dir[0].path_prefix}}/{{obj.name}}">
 										{% elif obj.type.name == "Directory" %}
 											{% set icon="fa-folder" %}
 										{% else %}
 											{% set icon="fa-question-circle" %}
 										{% endif %}
 										<img class="thumb" style="display:block" height="48" src="data:image/jpeg;base64,{{obj.file_details[0].thumbnail}}"></img>
-										{% if obj.type.name=="Image" %}
+										{% if obj.type.name=="Image" or obj.type.name == "Video" %}
 											</a>
 										{% endif %}
 										<div style="position:absolute; top: 2; left: 2;">
diff --git a/templates/files.html b/templates/files.html
index a5ae088..84a8e06 100644
--- a/templates/files.html
+++ b/templates/files.html
@@ -32,7 +32,7 @@
 								<a href="{{obj.in_dir[0].path_prefix}}/{{obj.name}}"><img class="thumb" height="128" src="data:image/jpeg;base64,{{obj.file_details[0].thumbnail}}"></img></a>
 							{% elif obj.type.name == "Video" %}
 								<div style="position:relative; width:100%">
-									<img class="thumb" style="display:block" height="128" src="data:image/jpeg;base64,{{obj.file_details[0].thumbnail}}"></img>
+                                    <a href="{{obj.in_dir[0].path_prefix}}/{{obj.name}}"><img class="thumb" style="display:block" height="128" src="data:image/jpeg;base64,{{obj.file_details[0].thumbnail}}"></img></a>
 									<div style="position:absolute; top: 2; left: 2;">
 										<i style="font-size:32;background-color:black;color:white" class="fas fa-film"></i>
 									</div>