diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js
index 0d2f8290986b..c3ce9b2b68ae 100644
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -787,19 +787,18 @@ var gSync = {
     const fragment = document.createDocumentFragment();
 
     const state = UIState.get();
-    if (
-      state.status == UIState.STATUS_SIGNED_IN &&
-      this.sendTabTargets.length > 0
-    ) {
-      this._appendSendTabDeviceList(
-        fragment,
-        createDeviceNodeFn,
-        url,
-        title,
-        multiselected
-      );
-    } else if (state.status == UIState.STATUS_SIGNED_IN) {
-      this._appendSendTabSingleDevice(fragment, createDeviceNodeFn);
+    if (state.status == UIState.STATUS_SIGNED_IN) {
+      if (this.sendTabTargets.length > 0) {
+        this._appendSendTabDeviceList(
+          fragment,
+          createDeviceNodeFn,
+          url,
+          title,
+          multiselected
+        );
+      } else {
+        this._appendSendTabSingleDevice(fragment, createDeviceNodeFn);
+      }
     } else if (
       state.status == UIState.STATUS_NOT_VERIFIED ||
       state.status == UIState.STATUS_LOGIN_FAILED
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index 65c30e1e2803..7051ccaf2fb7 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -785,7 +785,7 @@
         <toolbarbutton id="PanelUI-fxa-menu-sendtab-not-configured-button"
                        class="PanelUI-fxa-signin-button"
                        label="&fxa.menu.signin.label;"
-                       oncommand="gSync.openFxAEmailFirstPageFromFxaMenu(this);"/>
+                       oncommand="gSync.openPrefsFromFxaMenu('send_tab', this);"/>
       </vbox>
     </panelview>
     <panelview id="PanelUI-fxa-menu-sendtab-no-devices" flex="1" class="PanelUI-subView">