diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift
index 80f68a1b9..2d2883160 100644
--- a/Mac/AppDelegate.swift
+++ b/Mac/AppDelegate.swift
@@ -404,6 +404,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 			return !isDisplayingSheet && !AccountManager.shared.activeAccounts.isEmpty
 		}
 		if item.action == #selector(showAddTwitterFeedWindow(_:)) {
+			guard !isDisplayingSheet && !AccountManager.shared.activeAccounts.isEmpty else {
+				return false
+			}
 			return ExtensionPointManager.shared.activeExtensionPoints.values.contains(where: { $0 is TwitterFeedProvider })
 		}
 		#if !MAC_APP_STORE