diff --git a/mozilla/js/tests/importList.html b/mozilla/js/tests/importList.html
index d7cb7059de0..f9f167fc1fe 100644
--- a/mozilla/js/tests/importList.html
+++ b/mozilla/js/tests/importList.html
@@ -13,7 +13,7 @@
       function doImport()
       {
           var lines =
-              document.forms["foo"].elements["testList"].value.split("\n");
+              document.forms["foo"].elements["testList"].value.split(/\r?\n/);
           var suites = window.opener.suites;
           var elems = window.opener.document.forms["testCases"].elements;
 
@@ -22,7 +22,7 @@
 
           for (var l in lines)
           {
-              if (lines[l].search(/\s*\#/) == -1)
+              if (lines[l].search(/^\s$|\s*\#/) == -1)
               {
                   var ary = lines[l].match (/(.*)\/(.*)\/(.*)/);
 
@@ -41,6 +41,8 @@
           }
 
           window.opener.updateTotals();
+
+	  window.close();
                   
       }
       </script>
@@ -51,7 +53,7 @@
     <form name="foo">
       <textarea rows="25" cols="50" name="testList"></textarea><br>
       <input type="radio" name="clear_all" checked 
-        onclick="onRadioClick('clear_all');">
+        onclick="return onRadioClick('clear_all');">
       &nbsp;Clear all selections berofe import.<br>
       <input type="button" value="Import" onclick="doImport();">
       <input type="button" value="Cancel" onclick="window.close();">
diff --git a/mozilla/js/tests/mklistpage.pl b/mozilla/js/tests/mklistpage.pl
index 7f558a128b5..9d217ef0af1 100644
--- a/mozilla/js/tests/mklistpage.pl
+++ b/mozilla/js/tests/mklistpage.pl
@@ -201,7 +201,7 @@ sub process_test {
     $javascript .= "suites[\"$suite\"].testDirs[\"$test_dir\"].tests" .
       "[\"$test\"] = \"radio$uid\"\n";
     $html .= "      <input type='radio' value='$test' name='radio$uid' ".
-      "onclick='onRadioClick(\"radio$uid\")'>" .
+      "onclick='return onRadioClick(\"radio$uid\");'>" .
 	"<a href='$lxr_url$suite/$test_dir/$test' target='other_window'>" .
 	  "$test</a> $title<br>\n";