diff --git a/src/ConnectedMode.UnitTests/UI/ManageBinding/ManageBindingViewModelTests.cs b/src/ConnectedMode.UnitTests/UI/ManageBinding/ManageBindingViewModelTests.cs
index 51fd618ad6..af752c7f04 100644
--- a/src/ConnectedMode.UnitTests/UI/ManageBinding/ManageBindingViewModelTests.cs
+++ b/src/ConnectedMode.UnitTests/UI/ManageBinding/ManageBindingViewModelTests.cs
@@ -332,6 +332,42 @@ public void IsUseSharedBindingButtonEnabled_ReturnsTrueOnlyWhenNoBindingIsInProg
         testSubject.IsUseSharedBindingButtonEnabled.Should().Be(expectedResult);
     }
 
+    [TestMethod]
+    public void IsUseSharedBindingButtonVisible_SharedBindingConfigExistsAndProjectIsBound_ReturnsFalse()
+    {
+        testSubject.SharedBindingConfigModel = new SharedBindingConfigModel();
+        testSubject.BoundProject = serverProject;
+
+        testSubject.IsUseSharedBindingButtonVisible.Should().BeFalse();
+    }
+
+    [TestMethod]
+    public void IsUseSharedBindingButtonVisible_SharedBindingConfigExistsAndProjectIsUnbound_ReturnsTrue()
+    {
+        testSubject.SharedBindingConfigModel = new SharedBindingConfigModel();
+        testSubject.BoundProject = null;
+
+        testSubject.IsUseSharedBindingButtonVisible.Should().BeTrue();
+    }
+
+    [TestMethod]
+    public void IsUseSharedBindingButtonVisible_SharedBindingConfigDoesNotExistAndProjectIsBound_ReturnsFalse()
+    {
+        testSubject.SharedBindingConfigModel = null;
+        testSubject.BoundProject = serverProject;
+
+        testSubject.IsUseSharedBindingButtonVisible.Should().BeFalse();
+    }
+
+    [TestMethod]
+    public void IsUseSharedBindingButtonVisible_SharedBindingConfigDoesNotExistAndProjectIsUnbound_ReturnsFalse()
+    {
+        testSubject.SharedBindingConfigModel = null;
+        testSubject.BoundProject = null;
+
+        testSubject.IsUseSharedBindingButtonVisible.Should().BeFalse();
+    }
+
     [TestMethod]
     public void SharedBindingConfigModel_Set_RaisesEvents()
     {
@@ -584,13 +620,13 @@ await progressReporterViewModel.Received(1)
     }
     
     [TestMethod]
-    public async Task InitializeDataAsync_WhenBound_DoesNotChecksForSharedBindingAndReportsProgress()
+    public async Task InitializeDataAsync_WhenBound_ChecksForSharedBindingAndReportsProgress()
     {
         testSubject.BoundProject = serverProject;
         
         await testSubject.InitializeDataAsync();
 
-        await progressReporterViewModel.DidNotReceive()
+        await progressReporterViewModel.Received(1)
             .ExecuteTaskWithProgressAsync(
                 Arg.Is<TaskToPerformParams<AdapterResponse>>(x =>
                     x.TaskToPerform == testSubject.CheckForSharedBindingAsync &&
diff --git a/src/ConnectedMode/UI/ManageBinding/ManageBindingViewModel.cs b/src/ConnectedMode/UI/ManageBinding/ManageBindingViewModel.cs
index 67eb8ca1b7..9959dd6533 100644
--- a/src/ConnectedMode/UI/ManageBinding/ManageBindingViewModel.cs
+++ b/src/ConnectedMode/UI/ManageBinding/ManageBindingViewModel.cs
@@ -141,12 +141,10 @@ public async Task InitializeDataAsync()
             UiResources.FetchingBindingStatusFailedText) { AfterProgressUpdated = OnProgressUpdated };
         await ProgressReporter.ExecuteTaskWithProgressAsync(displayBindStatus);
 
-        if (!IsCurrentProjectBound)
-        {
-            var detectSharedBinding = new TaskToPerformParams<AdapterResponse>(CheckForSharedBindingAsync, UiResources.CheckingForSharedBindingText,
-                UiResources.CheckingForSharedBindingFailedText) { AfterProgressUpdated = OnProgressUpdated };
-            await ProgressReporter.ExecuteTaskWithProgressAsync(detectSharedBinding);
-        }
+        var detectSharedBinding = new TaskToPerformParams<AdapterResponse>(CheckForSharedBindingAsync, UiResources.CheckingForSharedBindingText,
+                UiResources.CheckingForSharedBindingFailedText)
+            { AfterProgressUpdated = OnProgressUpdated };
+        await ProgressReporter.ExecuteTaskWithProgressAsync(detectSharedBinding);
     }
 
     public async Task BindWithProgressAsync()