diff --git a/js/plugins/media.views.js b/js/plugins/media.views.js
index 9dfe231..36a023d 100644
--- a/js/plugins/media.views.js
+++ b/js/plugins/media.views.js
@@ -75,7 +75,7 @@ Drupal.media.browser.views.setup = function(view) {
 
   // Catch the click on a media item
   $('.view-content .media-item', view).bind('click', function () {
-    var fid = $(this).closest('a[data-fid]').data('fid'),
+    var fid = $(this).closest('.media-thumbnail-selector[data-fid]').data('fid'),
       selectedFiles = new Array();
 
     // Remove all currently selected files
diff --git a/media.views.inc b/media.views.inc
index e08e17f..1fd70f4 100644
--- a/media.views.inc
+++ b/media.views.inc
@@ -79,13 +79,13 @@ function template_preprocess_media_views_view_media_browser(&$vars) {
     // Add url/preview to the file object.
     media_browser_build_media_item($file);
     $vars['rows'][$index] = $file;
-    $vars['rows'][$index]->preview = l($file->preview, 'media/browser', array(
-      'html' => TRUE,
-      'attributes' => array(
-        'data-fid' => $row->fid,
-      ),
-      'query' => array('render' => 'media-popup', 'fid' => $row->fid))
+    // dpm($vars['rows'][$index]->preview);
+    $attributes = array(
+      'data-fid' => $row->fid,
+      'class' => 'media-thumbnail-selector'
     );
+    $vars['rows'][$index]->preview = '<div ' . drupal_attributes($attributes) . ">\n" . $file->preview . "</div>\n";
+    
   }
 
   // Add the files to JS so that they are accessible inside the browser.