diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index a57e55c7ff7..4fc1323cb13 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -505,7 +505,8 @@
                         accesskey="&addons.accesskey;"
                         key="key_openAddons"
                         command="Tools:Addons"/>
-              <menu id="menu_socialAmbientMenu">
+              <menu id="menu_socialAmbientMenu"
+                    observes="socialActiveBroadcaster">
                 <menupopup id="menu_social-statusarea-popup">
                   <menuitem class="social-statusarea-user menuitem-iconic" pack="start" align="center"
                             observes="socialBroadcaster_userDetails"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 46c6f192df6..f93f00dcd54 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -193,6 +193,7 @@
 #endif
     <broadcaster id="workOfflineMenuitemState"/>
     <broadcaster id="socialSidebarBroadcaster" hidden="true"/>
+    <broadcaster id="socialActiveBroadcaster" hidden="true"/>
 
     <!-- DevTools broadcasters -->
     <broadcaster id="devtoolsMenuBroadcaster_DevToolbar"
diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index c1f3bb6d766..6eb18e1523d 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -17,6 +17,7 @@ let SocialUI = {
 
     Services.prefs.addObserver("social.sidebar.open", this, false);
     Services.prefs.addObserver("social.toast-notifications.enabled", this, false);
+    Services.prefs.addObserver("social.active", this, false);
 
     gBrowser.addEventListener("ActivateSocialFeature", this._activationEventHandler, true, true);
 
@@ -26,6 +27,7 @@ let SocialUI = {
       SocialChatBar.update();
     });
 
+    this.updateActiveBroadcaster();
     Social.init(this._providerReady.bind(this));
   },
 
@@ -39,6 +41,7 @@ let SocialUI = {
 
     Services.prefs.removeObserver("social.sidebar.open", this);
     Services.prefs.removeObserver("social.toast-notifications.enabled", this);
+    Services.prefs.removeObserver("social.active", this);
   },
 
   showProfile: function SocialUI_showProfile() {
@@ -62,6 +65,7 @@ let SocialUI = {
           SocialSidebar.update();
           SocialChatBar.update();
           SocialFlyout.unload();
+          SocialMenu.populate();
         } catch (e) {
           Components.utils.reportError(e);
           throw e;
@@ -86,6 +90,8 @@ let SocialUI = {
         }
         break;
       case "nsPref:changed":
+        this.updateActiveBroadcaster();
+        this.updateToggleCommand();
         SocialSidebar.update();
         SocialToolbar.updateButton();
         SocialMenu.populate();
@@ -130,6 +136,11 @@ let SocialUI = {
     toggleCommand.setAttribute("hidden", Social.active ? "false" : "true");
   },
 
+  updateActiveBroadcaster: function SocialUI_updateActiveBroadcaster() {
+    let broadcaster = document.getElementById("socialActiveBroadcaster");
+    broadcaster.hidden = !Social.active;
+  },
+
   // This handles "ActivateSocialFeature" events fired against content documents
   // in this window.
   _activationEventHandler: function SocialUI_activationHandler(e) {
@@ -592,7 +603,6 @@ let SocialShareButton = {
 
 var SocialMenu = {
   populate: function SocialMenu_populate() {
-    // This menu is only accessible through keyboard navigation.
     let submenu = document.getElementById("menu_social-statusarea-popup");
     let ambientMenuItems = submenu.getElementsByClassName("ambient-menuitem");
     while (ambientMenuItems.length)
@@ -601,7 +611,7 @@ var SocialMenu = {
     let separator = document.getElementById("socialAmbientMenuSeparator");
     separator.hidden = true;
     let provider = Social.provider;
-    if (Social.active && provider) {
+    if (provider && provider.enabled) {
       let iconNames = Object.keys(provider.ambientNotificationIcons);
       for (let name of iconNames) {
         let icon = provider.ambientNotificationIcons[name];
@@ -645,7 +655,6 @@ var SocialToolbar = {
 
   updateButtonHiddenState: function SocialToolbar_updateButtonHiddenState() {
     let tbi = document.getElementById("social-toolbar-item");
-    tbi.hidden = !Social.active;
     let socialEnabled = Social.enabled;
     for (let className of ["social-statusarea-separator", "social-statusarea-user"]) {
       for (let element of document.getElementsByClassName(className))
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 38d9462e564..3beab97d813 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -662,7 +662,8 @@
                    class="chromeclass-toolbar-additional"
                    removable="false"
                    title="&socialToolbar.title;"
-                   hidden="true">
+                   hidden="true"
+                   observes="socialActiveBroadcaster">
         <toolbarbutton id="social-provider-button"
                        class="toolbarbutton-1"
                        type="menu">
diff --git a/browser/modules/Social.jsm b/browser/modules/Social.jsm
index bafe528f7fa..236979a7b58 100644
--- a/browser/modules/Social.jsm
+++ b/browser/modules/Social.jsm
@@ -71,8 +71,8 @@ this.Social = {
     return Services.prefs.getBoolPref("social.active");
   },
   set active(val) {
-    Services.prefs.setBoolPref("social.active", !!val);
     this.enabled = !!val;
+    Services.prefs.setBoolPref("social.active", !!val);
   },
 
   toggle: function Social_toggle() {