diff --git a/browser/components/downloads/content/downloads.css b/browser/components/downloads/content/downloads.css
index c30db339a64..8f53421902c 100644
--- a/browser/components/downloads/content/downloads.css
+++ b/browser/components/downloads/content/downloads.css
@@ -2,6 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/*** Download panel ***/
+
+#downloadsPanel {
+  -moz-user-focus: normal;
+}
+
 /*** Download items ***/
 
 richlistitem[type="download"] {
diff --git a/browser/components/downloads/content/downloads.js b/browser/components/downloads/content/downloads.js
index e03867e3527..f6c680fc0de 100644
--- a/browser/components/downloads/content/downloads.js
+++ b/browser/components/downloads/content/downloads.js
@@ -356,7 +356,7 @@ const DownloadsPanel = {
       if (DownloadsView.richListBox.itemCount > 0) {
         DownloadsView.richListBox.focus();
       } else {
-        DownloadsView.downloadsHistory.focus();
+        this.panel.focus();
       }
     }
   },