diff --git a/pandora/archive/cutdetection.py b/pandora/archive/cutdetection.py
index df6ff0dd..c50e6050 100644
--- a/pandora/archive/cutdetection.py
+++ b/pandora/archive/cutdetection.py
@@ -18,6 +18,8 @@ def _get_distance(data0, data1):
 def detect_cuts(path, seconds=True):
     depth = 3
     info = ox.avinfo(path)
+    if not info.get('video'):
+        return []
     dar = AspectRatio(info['video'][0]['display_aspect_ratio'])
     fps = AspectRatio(info['video'][0]['framerate'])
     height = 96
diff --git a/static/js/previewPlayer.js b/static/js/previewPlayer.js
index cd1c9c12..54c67c32 100644
--- a/static/js/previewPlayer.js
+++ b/static/js/previewPlayer.js
@@ -101,11 +101,11 @@ pandora.ui.previewPlayer = function() {
                         ],
                         controlsTooltips: {
                             close: Ox._('Close'),
-                            open: Ox._('Open {0}', [pandora.site.itemName.singular])
+                            open: Ox._('Open {0}', [video.title])
                         },
                         controlsTop: [
                             Ox.Fullscreen.available ? 'fullscreen' : 'space16',
-                            'title',
+                            'space',
                             'open'
                         ],
                         duration: video.duration,
@@ -142,6 +142,9 @@ pandora.ui.previewPlayer = function() {
                         fullscreen: function(data) {
                             Ox.Fullscreen.toggle();
                         },
+                        close: function() {
+                            that.close();
+                        },
                         open: function() {
                             $player.options({paused: true});
                             var url = document.location.protocol + '//'