diff --git a/src/GitHub.TeamFoundation.14/Base/EnsureLoggedInSection.cs b/src/GitHub.TeamFoundation.14/Base/EnsureLoggedInSection.cs
index d2063710b1..e240fa0cad 100644
--- a/src/GitHub.TeamFoundation.14/Base/EnsureLoggedInSection.cs
+++ b/src/GitHub.TeamFoundation.14/Base/EnsureLoggedInSection.cs
@@ -45,7 +45,7 @@ async Task CheckLogin()
             if (ActiveRepo == null || ActiveRepoUri == null)
                 return;
 
-            var isgithub = await IsAGitHubRepo();
+            var isgithub = await IsAGitHubRepo(ActiveRepoUri);
             if (!isgithub)
                 return;
 
diff --git a/src/GitHub.TeamFoundation.14/Base/TeamExplorerNavigationItemBase.cs b/src/GitHub.TeamFoundation.14/Base/TeamExplorerNavigationItemBase.cs
index 384f830af3..e4acc09206 100644
--- a/src/GitHub.TeamFoundation.14/Base/TeamExplorerNavigationItemBase.cs
+++ b/src/GitHub.TeamFoundation.14/Base/TeamExplorerNavigationItemBase.cs
@@ -1,18 +1,23 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
+using System.Threading.Tasks;
 using GitHub.Api;
 using GitHub.Extensions;
+using GitHub.Logging;
 using GitHub.Services;
 using GitHub.UI;
 using GitHub.VisualStudio.Helpers;
 using Microsoft.TeamFoundation.Controls;
 using Microsoft.VisualStudio.PlatformUI;
+using Serilog;
 
 namespace GitHub.VisualStudio.Base
 {
     public class TeamExplorerNavigationItemBase : TeamExplorerItemBase, ITeamExplorerNavigationItem2
     {
+        static readonly ILogger log = LogManager.ForContext<TeamExplorerNavigationItemBase>();
+
         readonly Octicon octicon;
 
         public TeamExplorerNavigationItemBase(IGitHubServiceProvider serviceProvider,
@@ -35,10 +40,23 @@ public TeamExplorerNavigationItemBase(IGitHubServiceProvider serviceProvider,
             SubscribeToRepoChanges();
         }
 
-        public override async void Invalidate()
+        public override void Invalidate()
         {
             IsVisible = false;
-            IsVisible = await IsAGitHubRepo();
+            InvalidateAsync().Forget(log);
+        }
+
+        async Task InvalidateAsync()
+        {
+            var uri = ActiveRepoUri;
+            var isVisible = await IsAGitHubRepo(uri);
+            if (ActiveRepoUri != uri)
+            {
+                log.Information("Not setting button visibility because repository changed from {BeforeUrl} to {AfterUrl}", uri, ActiveRepoUri);
+                return;
+            }
+
+            IsVisible = isVisible;
         }
 
         void OnThemeChanged()
diff --git a/src/GitHub.TeamFoundation.14/Home/ForkNavigationItem.cs b/src/GitHub.TeamFoundation.14/Home/ForkNavigationItem.cs
index 4d96864c8f..f70c224c15 100644
--- a/src/GitHub.TeamFoundation.14/Home/ForkNavigationItem.cs
+++ b/src/GitHub.TeamFoundation.14/Home/ForkNavigationItem.cs
@@ -86,7 +86,7 @@ public override async void Invalidate()
             {
                 IsVisible = false;
 
-                if (await IsAGitHubDotComRepo())
+                if (await IsAGitHubDotComRepo(ActiveRepoUri))
                 {
                     var connection = await ConnectionManager.GetConnection(ActiveRepo);
                     IsVisible = connection?.IsLoggedIn ?? false;
diff --git a/src/GitHub.TeamFoundation.14/Home/GitHubHomeSection.cs b/src/GitHub.TeamFoundation.14/Home/GitHubHomeSection.cs
index ecb393b055..5d276cc3b4 100644
--- a/src/GitHub.TeamFoundation.14/Home/GitHubHomeSection.cs
+++ b/src/GitHub.TeamFoundation.14/Home/GitHubHomeSection.cs
@@ -64,7 +64,7 @@ protected async override void RepoChanged()
 
             base.RepoChanged();
 
-            IsVisible = await IsAGitHubRepo();
+            IsVisible = await IsAGitHubRepo(ActiveRepoUri);
 
             if (IsVisible)
             {
@@ -93,7 +93,7 @@ protected async override void RepoChanged()
 
         public override async void Refresh()
         {
-            IsVisible = await IsAGitHubRepo();
+            IsVisible = await IsAGitHubRepo(ActiveRepoUri);
             if (IsVisible)
             {
                 IsLoggedIn = await IsUserAuthenticated();
diff --git a/src/GitHub.TeamFoundation.14/Home/IssuesNavigationItem.cs b/src/GitHub.TeamFoundation.14/Home/IssuesNavigationItem.cs
index 0ca6e99b98..54e2a4cdc5 100644
--- a/src/GitHub.TeamFoundation.14/Home/IssuesNavigationItem.cs
+++ b/src/GitHub.TeamFoundation.14/Home/IssuesNavigationItem.cs
@@ -40,7 +40,7 @@ public override async void Invalidate()
         {
             IsVisible = false;
 
-            var visible = await IsAGitHubRepo();
+            var visible = await IsAGitHubRepo(ActiveRepoUri);
             if (visible)
             {
                 var repo = await SimpleApiClient.GetRepository();
diff --git a/src/GitHub.TeamFoundation.14/Home/WikiNavigationItem.cs b/src/GitHub.TeamFoundation.14/Home/WikiNavigationItem.cs
index ddac4fa924..26fb5ab3dc 100644
--- a/src/GitHub.TeamFoundation.14/Home/WikiNavigationItem.cs
+++ b/src/GitHub.TeamFoundation.14/Home/WikiNavigationItem.cs
@@ -38,7 +38,7 @@ public override void Execute()
 
         public override async void Invalidate()
         {
-            var visible = await IsAGitHubRepo();
+            var visible = await IsAGitHubRepo(ActiveRepoUri);
             if (visible)
             {
                 var repo = await SimpleApiClient.GetRepository();
diff --git a/src/GitHub.VisualStudio.UI/Base/TeamExplorerItemBase.cs b/src/GitHub.VisualStudio.UI/Base/TeamExplorerItemBase.cs
index acab84eab8..ece0c9cc85 100644
--- a/src/GitHub.VisualStudio.UI/Base/TeamExplorerItemBase.cs
+++ b/src/GitHub.VisualStudio.UI/Base/TeamExplorerItemBase.cs
@@ -123,12 +123,8 @@ protected virtual void RepoChanged()
             }
         }
 
-        protected async Task<RepositoryOrigin> GetRepositoryOrigin()
+        protected async Task<RepositoryOrigin> GetRepositoryOrigin(UriString uri)
         {
-            if (ActiveRepo == null)
-                return RepositoryOrigin.NonGitRepository;
-
-            var uri = ActiveRepoUri;
             if (uri == null)
                 return RepositoryOrigin.Other;
 
@@ -154,15 +150,15 @@ protected async Task<RepositoryOrigin> GetRepositoryOrigin()
             return RepositoryOrigin.Other;
         }
 
-        protected async Task<bool> IsAGitHubRepo()
+        protected async Task<bool> IsAGitHubRepo(UriString uri)
         {
-            var origin = await GetRepositoryOrigin();
+            var origin = await GetRepositoryOrigin(uri);
             return origin == RepositoryOrigin.DotCom || origin == RepositoryOrigin.Enterprise;
         }
 
-        protected async Task<bool> IsAGitHubDotComRepo()
+        protected async Task<bool> IsAGitHubDotComRepo(UriString uri)
         {
-            var origin = await GetRepositoryOrigin();
+            var origin = await GetRepositoryOrigin(uri);
             return origin == RepositoryOrigin.DotCom;
         }