diff --git a/js/plugins/media.views.js b/js/plugins/media.views.js
index 1d497ac..e41916f 100644
--- a/js/plugins/media.views.js
+++ b/js/plugins/media.views.js
@@ -28,7 +28,7 @@ Drupal.behaviors.mediaViews = {
       var fid = $(this).parent('a[data-fid]').attr('data-fid');
       // Get the file from the settings which was stored in
       // template_preprocess_media_views_view_media_browser()
-      var file = Drupal.settings.media.files[fid];
+      var file = Drupal.settings.media.files["f" + fid];
       var files = new Array();
       files.push(file);
       Drupal.media.browser.selectMedia(files);
diff --git a/media.views.inc b/media.views.inc
index 08100c3..23d5eb0 100644
--- a/media.views.inc
+++ b/media.views.inc
@@ -66,9 +66,14 @@ function template_preprocess_media_views_view_media_browser(&$vars) {
       'query' => array('render' => 'media-popup', 'fid' => $row->fid))
     );
   }
-
+  
+  $file_array = array();
+  foreach ($files as $file) {
+    $file_array["f{$file->fid}"] = $file;
+  }
+//dsm($files);
   // Add the files to JS so that they are accessible inside the browser
-  drupal_add_js(array('media' => array('files' => $files)), 'setting');
+  drupal_add_js(array('media' => array('files' => $file_array)), 'setting');
 
 
   // Add classes and wrappers from the style plugin.