diff --git a/common/modules/downloads.jsm b/common/modules/downloads.jsm
index ef76a67d..7a9c0c70 100644
--- a/common/modules/downloads.jsm
+++ b/common/modules/downloads.jsm
@@ -32,7 +32,7 @@ var Download = Class("Download", {
             <tr highlight="Download" key="row" xmlns:dactyl={NS} xmlns={XHTML}>
                 <td highlight="DownloadTitle">
                     <span highlight="Link">
-                        <a key="launch" dactyl:command="download.command"
+                        <a key="launch"
                            href={self.target.spec} path={self.targetFile.path}>{self.displayName}</a>
                         <span highlight="LinkInfo">{self.targetFile.path}</span>
                     </span>
@@ -57,6 +57,13 @@ var Download = Class("Download", {
             </tr>,
             this.list.document, this.nodes);
 
+        this.nodes.launch.addEventListener("click", function (event) {
+            if (event.button == 0) {
+                event.preventDefault();
+                self.command("launch");
+            }
+        }, false);
+
         self.updateStatus();
         return self;
     },
@@ -82,7 +89,10 @@ var Download = Class("Download", {
         util.assert(set.has(this.allowedCommands, name), _("download.unknownCommand"));
         util.assert(this.allowedCommands[name], _("download.commandNotAllowed"));
 
-        services.downloadManager[name + "Download"](this.id);
+        if (set.has(this.commands, name))
+            this.commands[name].call(this);
+        else
+            services.downloadManager[name + "Download"](this.id);
     },
 
     commands: {