diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index c32aeb8f7c3..e731cd2a3b0 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -407,7 +407,9 @@
# overridden for other purposes there.
#endif
+
+
# don't use |command="Browser:Stop"|, ESC is being used to freeze animated gifs,
# even if the stop button and menuitem are disabled (see Bug 284140)
diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index 8674ba4ac31..4a9c5282859 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -210,6 +210,10 @@ let SocialChatBar = {
update: function() {
if (!this.canShow)
this.chatbar.removeAll();
+ },
+ focus: function SocialChatBar_focus() {
+ let commandDispatcher = gBrowser.ownerDocument.commandDispatcher;
+ commandDispatcher.advanceFocusIntoSubtree(this.chatbar);
}
}
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index a12e28411f9..2b22ecfeb33 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -659,3 +659,5 @@ toolbar button -->
+
+