diff --git a/mozilla/xpfe/components/download-manager/resources/downloadmanager.js b/mozilla/xpfe/components/download-manager/resources/downloadmanager.js
index e19fef27dec..f0693517eeb 100644
--- a/mozilla/xpfe/components/download-manager/resources/downloadmanager.js
+++ b/mozilla/xpfe/components/download-manager/resources/downloadmanager.js
@@ -139,10 +139,7 @@ function onSelect(aEvent) {
   window.updateCommands("tree-select");
 }
 
-function onDoubleClick(aEvent) {
-  if (aEvent.button != 0)
-    return;
-
+function onTrigger() {
   if (downloadViewController.isCommandEnabled('cmd_properties'))
     goDoCommand('cmd_properties');
   else if (downloadViewController.isCommandEnabled('cmd_openfile'))
diff --git a/mozilla/xpfe/components/download-manager/resources/downloadmanager.xul b/mozilla/xpfe/components/download-manager/resources/downloadmanager.xul
index 4f38946a193..7121e24684f 100644
--- a/mozilla/xpfe/components/download-manager/resources/downloadmanager.xul
+++ b/mozilla/xpfe/components/download-manager/resources/downloadmanager.xul
@@ -171,8 +171,10 @@
 
   <tree id="downloadView" flex="1" class="plain" context="downloadPaneContext"
             datasources="rdf:null" ref="NC:DownloadsRoot" flags="dont-test-empty"
-            ondblclick="onDoubleClick(event);" enableColumnDrag="true"
-            onselect="onSelect(event);">
+            enableColumnDrag="true" onselect="onSelect(event);"
+            ondblclick="if (event.button == 0) onTrigger();"
+            onkeypress="if ((event.keyCode == KeyEvent.DOM_VK_RETURN) ||
+                            (event.keyCode == KeyEvent.DOM_VK_ENTER)) onTrigger();">
     <treecols onclick="doSort(event.target)">
       <treecol id="Name" primary="true"
                    label="&view.header.name.label;"