diff --git a/profile/resources/content/profileManager.js b/profile/resources/content/profileManager.js
index 73862265869..7a6dd7308d0 100644
--- a/profile/resources/content/profileManager.js
+++ b/profile/resources/content/profileManager.js
@@ -269,9 +269,6 @@ function HandleKeyEvent( aEvent )
 {
   switch( aEvent.keyCode ) 
   {
-  case 13:
-    onStart();
-    break;
   case 46:
     if( profileManagerMode != "manager" )
       return;
@@ -289,7 +286,11 @@ function HandleClickEvent( aEvent )
 {
   if( aEvent.detail == 2 && aEvent.button == 0 ) {
     if( aEvent.target.nodeName.toLowerCase() == "treecell" && 
-        aEvent.target.parentNode.parentNode.nodeName.toLowerCase() != "treehead" )
-      return onStart(); 
+        aEvent.target.parentNode.parentNode.nodeName.toLowerCase() != "treehead" ) {
+          if (!onStart())
+            return false;
+          window.close();
+          return true;
+    } 
   }
 }
diff --git a/profile/resources/content/profileSelection.js b/profile/resources/content/profileSelection.js
index 6651bd3af49..ab6314dcf81 100644
--- a/profile/resources/content/profileSelection.js
+++ b/profile/resources/content/profileSelection.js
@@ -158,7 +158,7 @@ function loadElements()
 
 
 // function : <profileSelection.js>::onStart();
-// purpose  : starts mozilla given the selected profile (user choice: "Start Mozilla")
+// purpose  : sets the current profile to the selected profile (user choice: "Start Mozilla")
 function onStart()
 {
   var profileTree = document.getElementById("profiles");
@@ -219,6 +219,8 @@ function onStart()
       return;
     }
 
+    // All this really does is set the current profile.
+    // It has nothing to do with starting the application.
     profile.startApprunner(profilename);
   }
   catch (ex) {
@@ -235,11 +237,11 @@ function onExit()
 {
   try {
     profile.forgetCurrentProfile();
-    window.close();
   }
   catch (ex) {
     dump("Failed to forget current profile.\n");
   }
+  return true;
 }
 
 function foo()
diff --git a/profile/resources/content/profileSelection.xul b/profile/resources/content/profileSelection.xul
index 76d22d18957..3efb2e24096 100644
--- a/profile/resources/content/profileSelection.xul
+++ b/profile/resources/content/profileSelection.xul
@@ -59,7 +59,7 @@
   <script type="application/x-javascript" src="chrome://communicator/content/profile/profileSelection.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/profile/profileManager.js"/>
   
-  <keyset id="keyset">
+  <keyset id="dialogKeys">
     <key id="fooKey" key="s"   event="keydown" oncommand="foo()" modifiers="accel, shift"/>
   </keyset>