diff --git a/css/imce-content.css b/css/imce-content.css
index f746e0d..04c7df0 100644
--- a/css/imce-content.css
+++ b/css/imce-content.css
@@ -201,23 +201,24 @@ body.imce {
   table-layout: fixed;
   width: 100%;
 }
-#file-header td {
+#file-header td a {
   padding: 4px;
   font-weight: bold;
   cursor: default;
+  display:block;
 }
-#file-header td.asc {
+#file-header td.asc a {
   color: #f60;
 }
-#file-header td.asc:after {
-  content: "\2193";
+#file-header td.asc a:after {
+  content: " \2193";
   font-weight: normal;
 }
-#file-header td.desc {
+#file-header td.desc a {
   color: #09f;
 }
-#file-header td.desc:after {
-  content: "\2191";
+#file-header td.desc a:after {
+  content: " \2191";
   font-weight: normal;
 }
 #file-list td {
diff --git a/js/imce.js b/js/imce.js
index 2a2f9b4..2c4d058 100644
--- a/js/imce.js
+++ b/js/imce.js
@@ -690,11 +690,15 @@ highlight: function (fid) {
 
 //process a row
 processRow: function (row) {
-  row.cells[0].innerHTML = '<span>' + imce.decodePlain(row.id) + '</span>';
-  row.onmousedown = function(e) {
-    var e = e||window.event;
-    imce.fileClick(this, e.ctrlKey, e.shiftKey);
-    return !(e.ctrlKey || e.shiftKey);
+  row.cells[0].innerHTML = '<a href="#" class="file-name">' + imce.decodePlain(row.id) + '</a>';
+  row.onmousedown = 
+  row.cells[0].childNodes[0].onkeydown = 
+  function(e) {
+    if (e.keyCode == 0 || e.keyCode == 13) {
+      var e = e||window.event;
+      imce.fileClick(row, e.ctrlKey, e.shiftKey);
+      return !(e.ctrlKey || e.shiftKey);
+    }
   };
   row.ondblclick = function(e) {
     imce.send(this.id);
diff --git a/tpl/imce-content.tpl.php b/tpl/imce-content.tpl.php
index 53a397c..9eb7235 100644
--- a/tpl/imce-content.tpl.php
+++ b/tpl/imce-content.tpl.php
@@ -75,11 +75,11 @@ $imce =& $imce_ref['imce'];//keep this line.
 
     <div id="file-header-wrapper">
       <table id="file-header" class="files"><tbody><tr>
-        <td class="name"><?php print t('File name'); ?></td>
-        <td class="size"><?php print t('Size'); ?></td>
-        <td class="width"><?php print t('Width'); ?></td>
-        <td class="height"><?php print t('Height'); ?></td>
-        <td class="date"><?php print t('Date'); ?></td>
+        <td class="name"><a href="#"><?php print t('File name'); ?></a></td>
+        <td class="size"><a href="#"><?php print t('Size'); ?></a></td>
+        <td class="width"><a href="#"><?php print t('Width'); ?></a></td>
+        <td class="height"><a href="#"><?php print t('Height'); ?></a></td>
+        <td class="date"><a href="#"><?php print t('Date'); ?></a></td>
       </tr></tbody></table>
     </div>
 
