diff --git a/lib/plugins/browsertime/filmstrip.js b/lib/plugins/browsertime/filmstrip.js
index 5be24e03f..ed9e20176 100644
--- a/lib/plugins/browsertime/filmstrip.js
+++ b/lib/plugins/browsertime/filmstrip.js
@@ -127,6 +127,8 @@ module.exports = {
     let doWeHaveFilmstrip =
       options.browsertime.chrome.enableTraceScreenshots === true ||
       (options.browsertime.video === true &&
+        options.browsertime.videoParams.createFilmstrip === true) ||
+      (options.browsertime.visualMetrics === true &&
         options.browsertime.videoParams.createFilmstrip === true);
 
     if (doWeHaveFilmstrip === false) {
diff --git a/lib/plugins/html/templates/url/iteration/index.pug b/lib/plugins/html/templates/url/iteration/index.pug
index a3bc31d28..3b2ac1d47 100644
--- a/lib/plugins/html/templates/url/iteration/index.pug
+++ b/lib/plugins/html/templates/url/iteration/index.pug
@@ -131,7 +131,7 @@ block content
       section#video-panel
         include ../video/index.pug
 
-    if options.browsertime.video && options.videoParams.createFilmstrip || options.browsertime.chrome.enableTraceScreenshots
+    if (options.browsertime.video || options.browsertime.visualMetrics) && options.videoParams.createFilmstrip || options.browsertime.chrome.enableTraceScreenshots
       section#filmstrip-panel
         include ../filmstrip/index.pug        
 
diff --git a/lib/plugins/html/templates/url/iteration/tabs.pug b/lib/plugins/html/templates/url/iteration/tabs.pug
index d945118d5..2e176bd19 100644
--- a/lib/plugins/html/templates/url/iteration/tabs.pug
+++ b/lib/plugins/html/templates/url/iteration/tabs.pug
@@ -10,7 +10,7 @@
   if options.browsertime.video
     a(id='video', href='#video', onclick='return selectTab(this, true);')
       | Video
-  if options.browsertime.video && options.videoParams.createFilmstrip || options.browsertime.chrome.enableTraceScreenshots
+  if (options.browsertime.video || options.browsertime.visualMetrics) && options.videoParams.createFilmstrip || options.browsertime.chrome.enableTraceScreenshots
     a(id='filmstrip', href='#filmstrip', onclick='return selectTab(this, true);')
       | Filmstrip       
   if d.coach && d.coach.run
diff --git a/lib/plugins/html/templates/url/summary/index.pug b/lib/plugins/html/templates/url/summary/index.pug
index 46bd983d2..e40dea847 100644
--- a/lib/plugins/html/templates/url/summary/index.pug
+++ b/lib/plugins/html/templates/url/summary/index.pug
@@ -136,7 +136,7 @@ block content
       section#video-panel
         include ../video/index.pug
 
-    if options.browsertime.video && options.videoParams.createFilmstrip || options.browsertime.chrome.enableTraceScreenshots
+    if (options.browsertime.video || options.browsertime.visualMetrics) && options.videoParams.createFilmstrip || options.browsertime.chrome.enableTraceScreenshots
       section#filmstrip-panel
         include ../filmstrip/index.pug    
 
diff --git a/lib/plugins/html/templates/url/summary/tabs.pug b/lib/plugins/html/templates/url/summary/tabs.pug
index f8f85e65a..b849ca5fb 100644
--- a/lib/plugins/html/templates/url/summary/tabs.pug
+++ b/lib/plugins/html/templates/url/summary/tabs.pug
@@ -10,7 +10,7 @@
   if options.browsertime.video
     a(id='video', href='#video', onclick='return selectTab(this, true);')
       | Video
-  if options.browsertime.video && options.videoParams.createFilmstrip || options.browsertime.chrome.enableTraceScreenshots
+  if (options.browsertime.video || options.browsertime.visualMetrics) && options.videoParams.createFilmstrip || options.browsertime.chrome.enableTraceScreenshots
     a(id='filmstrip', href='#filmstrip', onclick='return selectTab(this, true);')
       | Filmstrip      
   if d.coach && d.coach.pageSummary