diff --git a/mozilla/webtools/addons/public/htdocs/search.php b/mozilla/webtools/addons/public/htdocs/search.php
index cfae8f65c13..80f93feef2b 100644
--- a/mozilla/webtools/addons/public/htdocs/search.php
+++ b/mozilla/webtools/addons/public/htdocs/search.php
@@ -209,10 +209,10 @@ if (!empty($sql['sort'])) {
             $orderby .= " main.Name ASC";
             break;
         case 'rating':
-            $orderby .= " main.Rating DESC";
+            $orderby .= " main.Rating DESC, main.Name ASC";
             break;
         case 'downloads':
-            $orderby .= " main.TotalDownloads DESC";
+            $orderby .= " main.downloadcount DESC, main.Rating DESC";
             break;
     }
 } else {