diff --git a/mozilla/toolkit/mozapps/handling/content/dialog.js b/mozilla/toolkit/mozapps/handling/content/dialog.js
index 2bb1b2d7c1f..de4271a17d4 100644
--- a/mozilla/toolkit/mozapps/handling/content/dialog.js
+++ b/mozilla/toolkit/mozapps/handling/content/dialog.js
@@ -233,6 +233,17 @@ var dialog = {
       document.getElementById("remember-text").removeAttribute("visible");
   },
 
+  /**
+   * Function called when the user double clicks on an item of the list
+   */
+  onDblClick: function onDblClick()
+  {
+    if (this.selectedItem == this._itemChoose)
+      this.chooseApplication();
+    else
+      document.documentElement.acceptDialog();
+  },
+
   /////////////////////////////////////////////////////////////////////////////
   //// Getters / Setters
 
diff --git a/mozilla/toolkit/mozapps/handling/content/dialog.xul b/mozilla/toolkit/mozapps/handling/content/dialog.xul
index 34ccf3b90cb..01122019666 100644
--- a/mozilla/toolkit/mozapps/handling/content/dialog.xul
+++ b/mozilla/toolkit/mozapps/handling/content/dialog.xul
@@ -63,6 +63,7 @@
   <vbox flex="1">
     <description id="item-action-text"/>
     <richlistbox id="items" flex="1"
+                 ondblclick="dialog.onDblClick();"
                  onselect="dialog.updateOKButton();">
       <richlistitem id="item-choose" orient="horizontal" selected="true">
         <label value="&ChooseApp.description;" flex="1"/>