diff --git a/src/ConnectedMode.UnitTests/Persistence/SolutionBindingRepositoryTests.cs b/src/ConnectedMode.UnitTests/Persistence/SolutionBindingRepositoryTests.cs
index 72d5b7ce8..7ad191e61 100644
--- a/src/ConnectedMode.UnitTests/Persistence/SolutionBindingRepositoryTests.cs
+++ b/src/ConnectedMode.UnitTests/Persistence/SolutionBindingRepositoryTests.cs
@@ -18,6 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+using System.Windows;
 using SonarLint.VisualStudio.ConnectedMode.Binding;
 using SonarLint.VisualStudio.ConnectedMode.Persistence;
 using SonarLint.VisualStudio.Core;
@@ -297,14 +298,37 @@ public void DeleteBinding_DeletesBindingDirectoryOfBindingFile()
     [DataRow(false)]
     public void DeleteBinding_ReturnsResultOfDeleteBindingDirectory(bool expectedResult)
     {
-        unintrusiveBindingPathProvider.GetBindingPath(LocalBindingKey).Returns(MockFilePath);
-        solutionBindingFileLoader.DeleteBindingDirectory(MockFilePath).Returns(expectedResult);
+        MockDeletingBindingDirectory(LocalBindingKey, expectedResult);
 
         var result = testSubject.DeleteBinding(LocalBindingKey);
 
         result.Should().Be(expectedResult);
     }
 
+    [TestMethod]
+    public void DeleteBinding_DirectoryNotDeleted_EventNotTriggered()
+    {
+        var eventHandler = Substitute.For<EventHandler<LocalBindingKeyEventArgs>>();
+        testSubject.BindingDeleted += eventHandler;
+        MockDeletingBindingDirectory(LocalBindingKey, deleted:false);
+
+        testSubject.DeleteBinding(LocalBindingKey);
+
+        eventHandler.DidNotReceiveWithAnyArgs().Invoke(default, default);
+    }
+
+    [TestMethod]
+    public void DeleteBinding_DirectoryDeleted_EventTriggered()
+    {
+        var eventHandler = Substitute.For<EventHandler<LocalBindingKeyEventArgs>>();
+        testSubject.BindingDeleted += eventHandler;
+        MockDeletingBindingDirectory(LocalBindingKey, deleted: true);
+
+        testSubject.DeleteBinding(LocalBindingKey);
+
+        eventHandler.Received(1).Invoke(testSubject, Arg.Is<LocalBindingKeyEventArgs>(x => x.LocalBindingKey == LocalBindingKey));
+    }
+
     private BoundServerProject SetUpBinding(string solution, ServerConnection connection, string bindingConfig)
     {
         var dto = new BindingJsonModel { ServerConnectionId = connection?.Id };
@@ -329,4 +353,10 @@ private void SetUpConnections(params ServerConnection[] connections) =>
             });
 
     private void SetUpUnintrusiveBindingPathProvider(params string[] bindigFolders) => unintrusiveBindingPathProvider.GetBindingPaths().Returns(bindigFolders);
+
+    private void MockDeletingBindingDirectory(string localBindingKey, bool deleted)
+    {
+        unintrusiveBindingPathProvider.GetBindingPath(localBindingKey).Returns(MockFilePath);
+        solutionBindingFileLoader.DeleteBindingDirectory(MockFilePath).Returns(deleted);
+    }
 }
diff --git a/src/ConnectedMode.UnitTests/UI/DeleteConnection/DeleteConnectionDialogViewModelTests.cs b/src/ConnectedMode.UnitTests/UI/DeleteConnection/DeleteConnectionDialogViewModelTests.cs
index 887bfedd3..bb9a54282 100644
--- a/src/ConnectedMode.UnitTests/UI/DeleteConnection/DeleteConnectionDialogViewModelTests.cs
+++ b/src/ConnectedMode.UnitTests/UI/DeleteConnection/DeleteConnectionDialogViewModelTests.cs
@@ -31,7 +31,7 @@ public class DeleteConnectionDialogViewModelTests
     [TestMethod]
     public void Ctor_SetsProperties()
     {
-        var projectsToUnbind = Substitute.For<IReadOnlyList<ConnectedModeProject>>();
+        var projectsToUnbind = Substitute.For<IReadOnlyList<string>>();
         var connectionInfo = new ConnectionInfo(default, default);
         var testSubject = new DeleteConnectionDialogViewModel(projectsToUnbind, connectionInfo);
 
@@ -42,7 +42,7 @@ public void Ctor_SetsProperties()
     [DataTestMethod]
     public void DisplayProjectList_MultipleProjectsToUnbind_ReturnsTrue()
     {
-        var projects = new[] { new ConnectedModeProject(new ServerProject("proj key", "proj name"), new SolutionInfoModel("my sol", SolutionType.Folder)) };
+        var projects = new[] { "proj key", "my sol" };
         var testSubject = new DeleteConnectionDialogViewModel(projects, new ConnectionInfo(default, default));
 
         testSubject.DisplayProjectList.Should().BeTrue();
diff --git a/src/ConnectedMode.UnitTests/UI/DeleteConnection/PreventDeleteConnectionViewModelTests.cs b/src/ConnectedMode.UnitTests/UI/DeleteConnection/PreventDeleteConnectionViewModelTests.cs
deleted file mode 100644
index 76e22efa6..000000000
--- a/src/ConnectedMode.UnitTests/UI/DeleteConnection/PreventDeleteConnectionViewModelTests.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * SonarLint for Visual Studio
- * Copyright (C) 2016-2024 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-using SonarLint.VisualStudio.ConnectedMode.UI.DeleteConnection;
-
-namespace SonarLint.VisualStudio.ConnectedMode.UnitTests.UI.DeleteConnection;
-
-[TestClass]
-public class PreventDeleteConnectionViewModelTests
-{
-    [TestMethod]
-    public void Ctor_SetsProperties()
-    {
-        var projectsToUnbind = Substitute.For<IReadOnlyList<string>>();
-        var connectionInfo = new ConnectionInfo(default, default);
-
-        var testSubject = new PreventDeleteConnectionViewModel(projectsToUnbind, connectionInfo);
-
-        testSubject.ConnectionInfo.Should().BeSameAs(connectionInfo);
-        testSubject.ProjectsToUnbind.Should().BeSameAs(projectsToUnbind);
-    }
-
-    [DataTestMethod]
-    public void DisplayProjectList_MultipleProjectsToUnbind_ReturnsTrue()
-    {
-        var projects = new[] { "binding1", "binding2"};
-
-        var testSubject = new PreventDeleteConnectionViewModel(projects, new ConnectionInfo(default, default));
-
-        testSubject.DisplayProjectList.Should().BeTrue();
-    }
-
-    [DataTestMethod]
-    public void DisplayProjectList_ProjectsIsNull_ReturnsFalse()
-    {
-        var testSubject = new PreventDeleteConnectionViewModel(null, new ConnectionInfo(default, default));
-
-        testSubject.DisplayProjectList.Should().BeFalse();
-    }
-
-    [DataTestMethod]
-    public void DisplayProjectList_NoProjectsToUnbind_ReturnsFalse()
-    {
-        var testSubject = new PreventDeleteConnectionViewModel([], new ConnectionInfo(default, default));
-
-        testSubject.DisplayProjectList.Should().BeFalse();
-    }
-}
diff --git a/src/ConnectedMode.UnitTests/UI/ManageConnections/ManageConnectionsViewModelTest.cs b/src/ConnectedMode.UnitTests/UI/ManageConnections/ManageConnectionsViewModelTest.cs
index cb1354674..b30f36fec 100644
--- a/src/ConnectedMode.UnitTests/UI/ManageConnections/ManageConnectionsViewModelTest.cs
+++ b/src/ConnectedMode.UnitTests/UI/ManageConnections/ManageConnectionsViewModelTest.cs
@@ -43,6 +43,8 @@ public class ManageConnectionsViewModelTest
     private IBindingController bindingController;
     private IConnectedModeBindingServices connectedModeBindingServices;
     private ISolutionBindingRepository solutionBindingRepository;
+    private const string LocalBindingKey1 = "solution name 1";
+    private const string LocalBindingKey2 = "solution name 2";
 
     [TestInitialize]
     public void TestInitialize()
@@ -81,7 +83,7 @@ public void InitializeConnectionViewModels_InitializesConnectionsCorrectly()
     [TestMethod]
     public async Task RemoveConnectionWithProgressAsync_InitializesDataAndReportsProgress()
     {
-        await testSubject.RemoveConnectionWithProgressAsync(new ConnectionViewModel(new Connection(new ConnectionInfo("myOrg", ConnectionServerType.SonarCloud))));
+        await testSubject.RemoveConnectionWithProgressAsync([], new ConnectionViewModel(new Connection(new ConnectionInfo("myOrg", ConnectionServerType.SonarCloud))));
 
         await progressReporterViewModel.Received(1)
             .ExecuteTaskWithProgressAsync(
@@ -99,7 +101,7 @@ public void RemoveConnectionViewModel_ReturnsStatusFromSlCore(bool expectedStatu
         var connectionToRemove = testSubject.ConnectionViewModels[0];
         serverConnectionsRepositoryAdapter.TryRemoveConnection(connectionToRemove.Connection.Info).Returns(expectedStatus);
 
-        var succeeded = testSubject.RemoveConnectionViewModel(connectionToRemove);
+        var succeeded = testSubject.RemoveConnectionViewModel([], connectionToRemove);
 
         succeeded.Should().Be(expectedStatus);
         serverConnectionsRepositoryAdapter.Received(1).TryRemoveConnection(connectionToRemove.Connection.Info);
@@ -112,7 +114,7 @@ public void RemoveConnection_ConnectionWasRemoved_RemovesProvidedConnectionViewM
         var connectionToRemove = testSubject.ConnectionViewModels[0];
         serverConnectionsRepositoryAdapter.TryRemoveConnection(connectionToRemove.Connection.Info).Returns(true);
 
-        testSubject.RemoveConnectionViewModel(connectionToRemove);
+        testSubject.RemoveConnectionViewModel([], connectionToRemove);
 
         testSubject.ConnectionViewModels.Count.Should().Be(twoConnections.Count - 1);
         testSubject.ConnectionViewModels.Should().NotContain(connectionToRemove);
@@ -125,7 +127,7 @@ public void RemoveConnectionViewModel_ConnectionWasNotRemoved_DoesNotRemoveProvi
         var connectionToRemove = testSubject.ConnectionViewModels[0];
         serverConnectionsRepositoryAdapter.TryRemoveConnection(connectionToRemove.Connection.Info).Returns(false);
 
-        testSubject.RemoveConnectionViewModel(connectionToRemove);
+        testSubject.RemoveConnectionViewModel([], connectionToRemove);
 
         testSubject.ConnectionViewModels.Count.Should().Be(twoConnections.Count);
         testSubject.ConnectionViewModels.Should().Contain(connectionToRemove);
@@ -139,7 +141,7 @@ public void RemoveConnection_ConnectionWasRemoved_RaisesEvents()
         var eventHandler = Substitute.For<PropertyChangedEventHandler>();
         testSubject.PropertyChanged += eventHandler;
 
-        testSubject.RemoveConnectionViewModel(testSubject.ConnectionViewModels[0]);
+        testSubject.RemoveConnectionViewModel([], testSubject.ConnectionViewModels[0]);
 
         eventHandler.Received().Invoke(testSubject, Arg.Is<PropertyChangedEventArgs>(x => x.PropertyName == nameof(testSubject.NoConnectionExists)));
     }
@@ -152,11 +154,80 @@ public void RemoveConnectionViewModel_ConnectionWasNotRemoved_DoesNotRaiseEvents
         var eventHandler = Substitute.For<PropertyChangedEventHandler>();
         testSubject.PropertyChanged += eventHandler;
 
-        testSubject.RemoveConnectionViewModel(testSubject.ConnectionViewModels[0]);
+        testSubject.RemoveConnectionViewModel([], testSubject.ConnectionViewModels[0]);
 
         eventHandler.DidNotReceive().Invoke(testSubject, Arg.Any<PropertyChangedEventArgs>());
     }
 
+    [TestMethod]
+    public void RemoveConnectionViewModel_TwoBindingsExistForConnection_RemovesBindingsAndThenConnection()
+    {
+        InitializeTwoConnections();
+        MockDeleteBinding(LocalBindingKey1, true);
+        MockDeleteBinding(LocalBindingKey2, true);
+
+        testSubject.RemoveConnectionViewModel([LocalBindingKey1, LocalBindingKey2], testSubject.ConnectionViewModels[0]);
+
+        Received.InOrder(() =>
+        {
+            solutionBindingRepository.DeleteBinding(LocalBindingKey1);
+            solutionBindingRepository.DeleteBinding(LocalBindingKey2);
+            serverConnectionsRepositoryAdapter.TryRemoveConnection(testSubject.ConnectionViewModels[0].Connection.Info);
+        });
+    }
+
+    [TestMethod]
+    public void RemoveConnectionViewModel_TwoBindingsExistForConnection_DeletingOneBindingFails_DoesNotRemoveConnection()
+    {
+        InitializeTwoConnections();
+        MockDeleteBinding(LocalBindingKey1, true);
+        MockDeleteBinding(LocalBindingKey2, false);
+
+        testSubject.RemoveConnectionViewModel([LocalBindingKey1, LocalBindingKey2], testSubject.ConnectionViewModels[0]);
+
+        Received.InOrder(() =>
+        {
+            solutionBindingRepository.DeleteBinding(LocalBindingKey1);
+            solutionBindingRepository.DeleteBinding(LocalBindingKey2);
+            logger.WriteLine(UiResources.DeleteConnection_DeleteBindingFails, LocalBindingKey2);
+        });
+        serverConnectionsRepositoryAdapter.DidNotReceive().TryRemoveConnection(testSubject.ConnectionViewModels[0].Connection.Info);
+    }
+
+    [TestMethod]
+    public void RemoveConnectionViewModel_TwoBindingsExistForConnection_OneBindingIsForCurrentSolution_CallsUnbind()
+    {
+        InitializeTwoConnections();
+        InitializeCurrentSolution(LocalBindingKey2);
+        MockDeleteBinding(LocalBindingKey1, true);
+        MockUnbind(LocalBindingKey2, true);
+
+        testSubject.RemoveConnectionViewModel([LocalBindingKey1, LocalBindingKey2], testSubject.ConnectionViewModels[0]);
+
+        Received.InOrder(() =>
+        {
+            solutionBindingRepository.DeleteBinding(LocalBindingKey1);
+            bindingController.Unbind(LocalBindingKey2);
+            serverConnectionsRepositoryAdapter.TryRemoveConnection(testSubject.ConnectionViewModels[0].Connection.Info);
+        });
+        solutionBindingRepository.DidNotReceive().DeleteBinding(LocalBindingKey2);
+    }
+
+    [TestMethod]
+    public void RemoveConnectionViewModel_TwoBindingsExistForConnection_OneBindingIsForCurrentSolution_UnbindFails_DoesNotRemoveConnection()
+    {
+        InitializeTwoConnections();
+        InitializeCurrentSolution(LocalBindingKey2);
+        MockDeleteBinding(LocalBindingKey1, true);
+        MockUnbind(LocalBindingKey2, false);
+
+        testSubject.RemoveConnectionViewModel([LocalBindingKey1, LocalBindingKey2], testSubject.ConnectionViewModels[0]);
+
+        solutionBindingRepository.Received(1).DeleteBinding(LocalBindingKey1);
+        bindingController.Received(1).Unbind(LocalBindingKey2);
+        serverConnectionsRepositoryAdapter.DidNotReceive().TryRemoveConnection(testSubject.ConnectionViewModels[0].Connection.Info);
+    }
+
     [TestMethod]
     public async Task SafeExecuteActionAsync_LoadsConnectionsOnUIThread()
     {
@@ -610,4 +681,10 @@ private static ServerConnection.SonarQube CreateSonarQubeServerConnection(Connec
     {
         return new ServerConnection.SonarQube(new Uri(sonarQube.Info.Id));
     }
+
+    private void MockDeleteBinding(string localBindingKey, bool success) => connectedModeBindingServices.SolutionBindingRepository.DeleteBinding(localBindingKey).Returns(success);
+
+    private void MockUnbind(string localBindingKey, bool success) => connectedModeBindingServices.BindingController.Unbind(localBindingKey).Returns(success);
+
+    private void InitializeCurrentSolution(string solutionName) => connectedModeBindingServices.SolutionInfoProvider.GetSolutionName().Returns(solutionName);
 }
diff --git a/src/ConnectedMode/ConnectedMode.csproj b/src/ConnectedMode/ConnectedMode.csproj
index f21c6d4b6..a455c17db 100644
--- a/src/ConnectedMode/ConnectedMode.csproj
+++ b/src/ConnectedMode/ConnectedMode.csproj
@@ -56,9 +56,6 @@
 
   <ItemGroup>
     <Page Include="Migration\Wizard\MigrationWizardWindow.xaml" />
-    <Page Include="UI\DeleteConnection\PreventDeleteConnectionDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="UI\ProgressAndErrorReporterComponent.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/src/ConnectedMode/Persistence/SolutionBindingRepository.cs b/src/ConnectedMode/Persistence/SolutionBindingRepository.cs
index e67db54d4..16ae5d4be 100644
--- a/src/ConnectedMode/Persistence/SolutionBindingRepository.cs
+++ b/src/ConnectedMode/Persistence/SolutionBindingRepository.cs
@@ -103,10 +103,16 @@ public bool Write(string configFilePath, BoundServerProject binding)
     public bool DeleteBinding(string localBindingKey)
     {
         var bindingPath = unintrusiveBindingPathProvider.GetBindingPath(localBindingKey);
-        return solutionBindingFileLoader.DeleteBindingDirectory(bindingPath);
+        if (!solutionBindingFileLoader.DeleteBindingDirectory(bindingPath))
+        {
+            return false;
+        }
+        BindingDeleted?.Invoke(this, new LocalBindingKeyEventArgs(localBindingKey));
+        return true;
     }
 
     public event EventHandler BindingUpdated;
+    public event EventHandler<LocalBindingKeyEventArgs> BindingDeleted;
 
     public IEnumerable<BoundServerProject> List()
     {
diff --git a/src/ConnectedMode/UI/DeleteConnection/DeleteConnectionDialog.xaml b/src/ConnectedMode/UI/DeleteConnection/DeleteConnectionDialog.xaml
index fba84dea3..a2a17703f 100644
--- a/src/ConnectedMode/UI/DeleteConnection/DeleteConnectionDialog.xaml
+++ b/src/ConnectedMode/UI/DeleteConnection/DeleteConnectionDialog.xaml
@@ -57,18 +57,6 @@
                      Margin="0, 10"
                      ItemContainerStyle="{StaticResource NoSelectionListBoxItemStyle}"
                      ItemsSource="{Binding ProjectsToUnbind}">
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock>
-                            <Run Text="{Binding Path=SolutionInfo.SolutionType, StringFormat='{}{0}'}" />
-                            <Run Text="{Binding Path=SolutionInfo.Name, StringFormat='{}&quot;{0}&quot;'}"
-                                 FontWeight="DemiBold" />
-                            <Run Text="{x:Static res:UiResources.BoundToLabel}" />
-                            <Run Text="{Binding Path=ServerProject.Name, StringFormat='{}&quot;{0}&quot;'}"
-                                 FontWeight="DemiBold" />
-                        </TextBlock>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
             </ListBox>
             <ui:WarningMessage Grid.Row="2"
                                WarningText="{x:Static res:UiResources.DeleteConnectionBindingsWarningText}" />
diff --git a/src/ConnectedMode/UI/DeleteConnection/DeleteConnectionDialog.xaml.cs b/src/ConnectedMode/UI/DeleteConnection/DeleteConnectionDialog.xaml.cs
index add410566..35e306436 100644
--- a/src/ConnectedMode/UI/DeleteConnection/DeleteConnectionDialog.xaml.cs
+++ b/src/ConnectedMode/UI/DeleteConnection/DeleteConnectionDialog.xaml.cs
@@ -28,7 +28,7 @@ public partial class DeleteConnectionDialog : Window
 {
     public DeleteConnectionDialogViewModel ViewModel { get; }
     
-    public DeleteConnectionDialog(IReadOnlyList<ConnectedModeProject> projectsToUnbind, ConnectionInfo connectionInfo)
+    public DeleteConnectionDialog(IReadOnlyList<string> projectsToUnbind, ConnectionInfo connectionInfo)
     {
         ViewModel = new DeleteConnectionDialogViewModel(projectsToUnbind, connectionInfo);
         InitializeComponent();
diff --git a/src/ConnectedMode/UI/DeleteConnection/DeleteConnectionDialogViewModel.cs b/src/ConnectedMode/UI/DeleteConnection/DeleteConnectionDialogViewModel.cs
index 1f11bd0f0..29039b2b3 100644
--- a/src/ConnectedMode/UI/DeleteConnection/DeleteConnectionDialogViewModel.cs
+++ b/src/ConnectedMode/UI/DeleteConnection/DeleteConnectionDialogViewModel.cs
@@ -24,13 +24,13 @@ namespace SonarLint.VisualStudio.ConnectedMode.UI.DeleteConnection;
 
 public class DeleteConnectionDialogViewModel : ViewModelBase
 {
-    public DeleteConnectionDialogViewModel(IReadOnlyList<ConnectedModeProject> projectsToUnbind, ConnectionInfo connectionInfo)
+    public DeleteConnectionDialogViewModel(IReadOnlyList<string> projectsToUnbind, ConnectionInfo connectionInfo)
     {
         ProjectsToUnbind = projectsToUnbind;
         ConnectionInfo = connectionInfo;
     }
 
-    public IReadOnlyList<ConnectedModeProject> ProjectsToUnbind { get; }
+    public IReadOnlyList<string> ProjectsToUnbind { get; }
     public ConnectionInfo ConnectionInfo { get; }
 
     public bool DisplayProjectList => ProjectsToUnbind is not null && ProjectsToUnbind.Count > 0;
diff --git a/src/ConnectedMode/UI/DeleteConnection/PreventDeleteConnectionDialog.xaml b/src/ConnectedMode/UI/DeleteConnection/PreventDeleteConnectionDialog.xaml
deleted file mode 100644
index b8f789213..000000000
--- a/src/ConnectedMode/UI/DeleteConnection/PreventDeleteConnectionDialog.xaml
+++ /dev/null
@@ -1,77 +0,0 @@
-<Window x:Class="SonarLint.VisualStudio.ConnectedMode.UI.DeleteConnection.PreventDeleteConnectionDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:res="clr-namespace:SonarLint.VisualStudio.ConnectedMode.UI.Resources"
-        xmlns:ui="clr-namespace:SonarLint.VisualStudio.ConnectedMode.UI"
-        xmlns:converters="clr-namespace:SonarLint.VisualStudio.Core.WPF;assembly=SonarLint.VisualStudio.Core"
-        xmlns:links="clr-namespace:SonarLint.VisualStudio.Core;assembly=SonarLint.VisualStudio.Core"
-        Title="{x:Static res:UiResources.DeleteConnectionDialogTitle}"
-        Width="600"
-        MinHeight="200"
-        MaxHeight="400"
-        ResizeMode="NoResize"
-        SizeToContent="Height"
-        WindowStartupLocation="CenterOwner"
-        FocusManager.FocusedElement="{Binding ElementName=OrganizationComboBox}"
-        x:Name="This">
-    <Window.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary
-                    Source="pack://application:,,,/SonarLint.VisualStudio.ConnectedMode;component/UI/Resources/Styles.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-            <converters:BoolToVisibilityConverter x:Key="TrueToVisibleConverter" FalseValue="Collapsed"
-                                                  TrueValue="Visible" />
-            <converters:BoolToVisibilityConverter x:Key="FalseToVisibleConverter" FalseValue="Visible"
-                                                  TrueValue="Collapsed" />
-        </ResourceDictionary>
-    </Window.Resources>
-    <Window.Style>
-        <Style TargetType="Window" BasedOn="{StaticResource {x:Type Window}}" />
-    </Window.Style>
-
-    <Grid DataContext="{Binding ElementName=This, Path=ViewModel}" Margin="15">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <TextBlock Grid.Row="0" Margin="0, 0, 0, 20">
-            <Run Text="{x:Static res:UiResources.DeleteConnectionNotPossibleDescription}" />
-            <InlineUIContainer Style="{StaticResource ConnectionInfoInlineWrapper}">
-                <ui:ConnectionInfoComponent ConnectionInfo="{Binding ConnectionInfo}"
-                                            TextAndIconVerticalAlignment="Center" Margin="2,0" />
-            </InlineUIContainer>
-        </TextBlock>
-        <TextBlock Grid.Row="1"
-                   Text="{x:Static res:UiResources.DeleteConnectionNoProjectsLabel}"
-                   Visibility="{Binding DisplayProjectList, Converter={StaticResource FalseToVisibleConverter}}" />
-        <Grid Grid.Row="1" Visibility="{Binding DisplayProjectList, Converter={StaticResource TrueToVisibleConverter}}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <TextBlock Grid.Row="0" Text="{x:Static res:UiResources.DeleteConnectionBindingListToUnbindLabel}" />
-            <ListBox Grid.Row="1"
-                     Margin="0, 10"
-                     ItemContainerStyle="{StaticResource NoSelectionListBoxItemStyle}"
-                     ItemsSource="{Binding ProjectsToUnbind}" />
-            <TextBlock Grid.Row="2" Text="{x:Static res:UiResources.DeleteBindingHelpText}" Margin="0,20">
-                <Hyperlink NavigateUri="{x:Static links:DocumentationLinks.UnbindingProjectUri}"
-                           RequestNavigate="ViewWebsite">
-                    here
-                </Hyperlink>
-            </TextBlock>
-        </Grid>
-        <Grid Grid.Row="2" Margin="0, 20, 0, 0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <StackPanel Grid.Column="1" Style="{StaticResource DialogButtonsPanel}">
-                <Button Content="{x:Static res:UiResources.OkButton}" IsDefault="True" IsCancel="True" />
-            </StackPanel>
-        </Grid>
-    </Grid>
-</Window>
\ No newline at end of file
diff --git a/src/ConnectedMode/UI/DeleteConnection/PreventDeleteConnectionDialog.xaml.cs b/src/ConnectedMode/UI/DeleteConnection/PreventDeleteConnectionDialog.xaml.cs
deleted file mode 100644
index 85bc388b4..000000000
--- a/src/ConnectedMode/UI/DeleteConnection/PreventDeleteConnectionDialog.xaml.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * SonarLint for Visual Studio
- * Copyright (C) 2016-2024 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-using System.Diagnostics.CodeAnalysis;
-using System.Windows;
-using System.Windows.Navigation;
-using SonarLint.VisualStudio.Core;
-
-namespace SonarLint.VisualStudio.ConnectedMode.UI.DeleteConnection;
-
-[ExcludeFromCodeCoverage]
-public partial class PreventDeleteConnectionDialog : Window
-{
-    private readonly IBrowserService browserService;
-    public PreventDeleteConnectionViewModel ViewModel { get; }
-    
-    public PreventDeleteConnectionDialog(IReadOnlyList<string> projectsToUnbind, ConnectionInfo connectionInfo, IBrowserService browserService)
-    {
-        this.browserService = browserService;
-        ViewModel = new PreventDeleteConnectionViewModel(projectsToUnbind, connectionInfo);
-        InitializeComponent();
-    }
-
-    private void DeleteButton_OnClick(object sender, RoutedEventArgs e)
-    {
-        DialogResult = true;
-    }
-
-    private void ViewWebsite(object sender, RequestNavigateEventArgs e)
-    {
-        browserService.Navigate(e.Uri.AbsoluteUri);
-    }
-}
-
diff --git a/src/ConnectedMode/UI/DeleteConnection/PreventDeleteConnectionViewModel.cs b/src/ConnectedMode/UI/DeleteConnection/PreventDeleteConnectionViewModel.cs
deleted file mode 100644
index a0155dab7..000000000
--- a/src/ConnectedMode/UI/DeleteConnection/PreventDeleteConnectionViewModel.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * SonarLint for Visual Studio
- * Copyright (C) 2016-2024 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-using SonarLint.VisualStudio.Core.WPF;
-
-namespace SonarLint.VisualStudio.ConnectedMode.UI.DeleteConnection;
-
-public class PreventDeleteConnectionViewModel : ViewModelBase
-{
-    public PreventDeleteConnectionViewModel(IReadOnlyList<string> projectsToUnbind, ConnectionInfo connectionInfo)
-    {
-        ProjectsToUnbind = projectsToUnbind;
-        ConnectionInfo = connectionInfo;
-    }
-
-    public IReadOnlyList<string> ProjectsToUnbind { get; }
-    public ConnectionInfo ConnectionInfo { get; }
-
-    public bool DisplayProjectList => ProjectsToUnbind is not null && ProjectsToUnbind.Count > 0;
-}
diff --git a/src/ConnectedMode/UI/ManageConnections/ManageConnectionsDialog.xaml.cs b/src/ConnectedMode/UI/ManageConnections/ManageConnectionsDialog.xaml.cs
index ce6a7b623..332263caa 100644
--- a/src/ConnectedMode/UI/ManageConnections/ManageConnectionsDialog.xaml.cs
+++ b/src/ConnectedMode/UI/ManageConnections/ManageConnectionsDialog.xaml.cs
@@ -118,20 +118,11 @@ private async void RemoveConnectionButton_OnClick(object sender, RoutedEventArgs
             }
 
             var connectionReferences = await ViewModel.GetConnectionReferencesWithProgressAsync(connectionViewModel);
-            if (connectionReferences.Count > 0)
+            var deleteConnectionDialog = new DeleteConnectionDialog(connectionReferences, connectionViewModel.Connection.Info);
+            if (deleteConnectionDialog.ShowDialog(this) == true)
             {
-                var preventConnectionDeleteDialog = new PreventDeleteConnectionDialog(connectionReferences, connectionViewModel.Connection.Info, connectedModeServices.BrowserService);
-                preventConnectionDeleteDialog.ShowDialog(this);
+                await ViewModel.RemoveConnectionWithProgressAsync(connectionReferences, connectionViewModel);
             }
-            else
-            {
-                var deleteConnectionDialog = new DeleteConnectionDialog([], connectionViewModel.Connection.Info);
-                if (deleteConnectionDialog.ShowDialog(this) == true)
-                {
-                    await ViewModel.RemoveConnectionWithProgressAsync(connectionViewModel);
-                }
-            }
-           
         }
     }
 }
diff --git a/src/ConnectedMode/UI/ManageConnections/ManageConnectionsViewModel.cs b/src/ConnectedMode/UI/ManageConnections/ManageConnectionsViewModel.cs
index 6e540cc73..9d980beb6 100644
--- a/src/ConnectedMode/UI/ManageConnections/ManageConnectionsViewModel.cs
+++ b/src/ConnectedMode/UI/ManageConnections/ManageConnectionsViewModel.cs
@@ -42,10 +42,10 @@ internal async Task LoadConnectionsWithProgressAsync()
             await ProgressReporterViewModel.ExecuteTaskWithProgressAsync(validationParams);
         }
 
-        internal async Task RemoveConnectionWithProgressAsync(ConnectionViewModel connectionViewModel)
+        internal async Task RemoveConnectionWithProgressAsync(List<string> bindingKeysReferencedByConnection, ConnectionViewModel connectionViewModel)
         {
             var validationParams = new TaskToPerformParams<AdapterResponse>(
-                async () => await SafeExecuteActionAsync(() => RemoveConnectionViewModel(connectionViewModel)),
+                async () => await SafeExecuteActionAsync(() => RemoveConnectionViewModel(bindingKeysReferencedByConnection, connectionViewModel)),
                 UiResources.RemovingConnectionText,
                 UiResources.RemovingConnectionFailedText);
             await ProgressReporterViewModel.ExecuteTaskWithProgressAsync(validationParams);
@@ -145,8 +145,21 @@ internal bool InitializeConnectionViewModels()
             return succeeded;
         }
 
-        internal bool RemoveConnectionViewModel(ConnectionViewModel connectionViewModel)
+        /// <summary>
+        /// Deleting a connection involves removing the connection from the repository and deleting the bindings that reference that connection.
+        /// This is not an atomic operation: if deleting a binding failed, then the connection will not be removed.
+        /// Which means that some bindings could have been deleted in the process. This is acceptable as there is no user data loss and rebinding is an easy process.
+        /// </summary>
+        /// <param name="referencedBindingKeys">The list of localBindingKeys that reference the connection to be removed </param>
+        /// <param name="connectionViewModel">The <see cref="ConnectionViewModel"/> of the connection to be removed</param>
+        /// <returns>Returns true if all the bindings and the connection have been deleted successfully</returns>
+        internal bool RemoveConnectionViewModel(List<string> referencedBindingKeys, ConnectionViewModel connectionViewModel)
         {
+            var bindingsRemoved = DeleteBindings(referencedBindingKeys);
+            if (!bindingsRemoved)
+            {
+                return false;
+            }
             var succeeded = connectedModeServices.ServerConnectionsRepositoryAdapter.TryRemoveConnection(connectionViewModel.Connection.Info);
             if (succeeded)
             {
@@ -156,6 +169,22 @@ internal bool RemoveConnectionViewModel(ConnectionViewModel connectionViewModel)
             return succeeded;
         }
 
+        private bool DeleteBindings(List<string> connectionReferences)
+        {
+            var currentSolutionName = connectedModeBindingServices.SolutionInfoProvider.GetSolutionName();
+            foreach (var connectionReference in connectionReferences)
+            {
+                var bindingDeleted = currentSolutionName == connectionReference ? ConnectedModeBindingServices.BindingController.Unbind(connectionReference) : ConnectedModeBindingServices.SolutionBindingRepository.DeleteBinding(connectionReference);
+                if (!bindingDeleted)
+                {
+                    connectedModeServices.Logger.WriteLine(UiResources.DeleteConnection_DeleteBindingFails, connectionReference);
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
         internal bool CreateNewConnection(Connection connection, ICredentialsModel credentialsModel)
         {
             var succeeded = connectedModeServices.ServerConnectionsRepositoryAdapter.TryAddConnection(connection, credentialsModel);
diff --git a/src/ConnectedMode/UI/Resources/UiResources.Designer.cs b/src/ConnectedMode/UI/Resources/UiResources.Designer.cs
index 113f61bcd..fde5a44d9 100644
--- a/src/ConnectedMode/UI/Resources/UiResources.Designer.cs
+++ b/src/ConnectedMode/UI/Resources/UiResources.Designer.cs
@@ -294,6 +294,15 @@ public static string DeleteButton {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to [ConnectedMode] Removing the connection failed. The &apos;{0}&apos; project could not be unbound..
+        /// </summary>
+        public static string DeleteConnection_DeleteBindingFails {
+            get {
+                return ResourceManager.GetString("DeleteConnection_DeleteBindingFails", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to It is used in the following project bindings:.
         /// </summary>
@@ -783,7 +792,7 @@ public static string RemoveConnectionToolTip {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Removing the connection failed.
+        ///   Looks up a localized string similar to Removing the connection failed. Please check the SonarQube for Visual Studio logs for more details..
         /// </summary>
         public static string RemovingConnectionFailedText {
             get {
diff --git a/src/ConnectedMode/UI/Resources/UiResources.resx b/src/ConnectedMode/UI/Resources/UiResources.resx
index 51702a0e7..cb4a911e7 100644
--- a/src/ConnectedMode/UI/Resources/UiResources.resx
+++ b/src/ConnectedMode/UI/Resources/UiResources.resx
@@ -370,7 +370,7 @@
     <value>Creating connection...</value>
   </data>
   <data name="RemovingConnectionFailedText" xml:space="preserve">
-    <value>Removing the connection failed</value>
+    <value>Removing the connection failed. Please check the SonarQube for Visual Studio logs for more details.</value>
   </data>
   <data name="RemovingConnectionText" xml:space="preserve">
     <value>Removing connection...</value>
@@ -443,4 +443,7 @@ Please manually add the credentials for the connection and then try again.</valu
   <data name="CloseButton" xml:space="preserve">
     <value>Close</value>
   </data>
+  <data name="DeleteConnection_DeleteBindingFails" xml:space="preserve">
+    <value>[ConnectedMode] Removing the connection failed. The '{0}' project could not be unbound.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Core/Binding/ISolutionBindingRepository.cs b/src/Core/Binding/ISolutionBindingRepository.cs
index e0909422b..3e58f33dc 100644
--- a/src/Core/Binding/ISolutionBindingRepository.cs
+++ b/src/Core/Binding/ISolutionBindingRepository.cs
@@ -55,9 +55,19 @@ public interface ISolutionBindingRepository
     /// </summary>
     event EventHandler BindingUpdated;
 
+    /// <summary>
+    /// Raises when <see cref="DeleteBinding" /> operation completes successfully
+    /// </summary>
+    event EventHandler<LocalBindingKeyEventArgs> BindingDeleted;
+
     /// <summary>
     /// Lists all the binding information
     /// </summary>
     /// <returns></returns>
     IEnumerable<BoundServerProject> List();
 }
+
+public class LocalBindingKeyEventArgs(string localBindingKey) : EventArgs
+{
+    public string LocalBindingKey { get; } = localBindingKey;
+}
diff --git a/src/Roslyn.Suppressions/Roslyn.Suppressions.UnitTests/InProcess/RoslynSettingsFileSynchronizerTests.cs b/src/Roslyn.Suppressions/Roslyn.Suppressions.UnitTests/InProcess/RoslynSettingsFileSynchronizerTests.cs
index d70ecab23..728abb7f6 100644
--- a/src/Roslyn.Suppressions/Roslyn.Suppressions.UnitTests/InProcess/RoslynSettingsFileSynchronizerTests.cs
+++ b/src/Roslyn.Suppressions/Roslyn.Suppressions.UnitTests/InProcess/RoslynSettingsFileSynchronizerTests.cs
@@ -42,6 +42,7 @@ public class RoslynSettingsFileSynchronizerTests
     private RoslynSettingsFileSynchronizer testSubject;
     private IThreadHandling threadHandling;
     private readonly BindingConfiguration connectedBindingConfiguration = CreateConnectedConfiguration("some project key");
+    private ISolutionBindingRepository solutionBindingRepository;
 
     [TestInitialize]
     public void TestInitialize()
@@ -50,6 +51,7 @@ public void TestInitialize()
         roslynSettingsFileStorage = Substitute.For<IRoslynSettingsFileStorage>();
         configProvider = Substitute.For<IConfigurationProvider>();
         solutionInfoProvider = Substitute.For<ISolutionInfoProvider>();
+        solutionBindingRepository = Substitute.For<ISolutionBindingRepository>();
         threadHandling = Substitute.For<IThreadHandling>();
         logger = new TestLogger();
 
@@ -57,6 +59,7 @@ public void TestInitialize()
             roslynSettingsFileStorage,
             configProvider,
             solutionInfoProvider,
+            solutionBindingRepository,
             logger,
             threadHandling);
         threadHandling.SwitchToBackgroundThread().Returns(new NoOpThreadHandler.NoOpAwaitable());
@@ -69,6 +72,7 @@ public void MefCtor_CheckIsExported() =>
             MefTestHelpers.CreateExport<IRoslynSettingsFileStorage>(),
             MefTestHelpers.CreateExport<IConfigurationProvider>(),
             MefTestHelpers.CreateExport<ISolutionInfoProvider>(),
+            MefTestHelpers.CreateExport<ISolutionBindingRepository>(),
             MefTestHelpers.CreateExport<ILogger>());
 
     [TestMethod]
@@ -81,6 +85,13 @@ public void Ctor_RegisterToSuppressionsUpdateRequestedEvent()
         VerifyServerIssuesStoreNoOtherCalls();
     }
 
+    [TestMethod]
+    public void Ctor_RegisterToBindingDeletedEvent()
+    {
+        solutionBindingRepository.Received(1).BindingDeleted += Arg.Any<EventHandler<LocalBindingKeyEventArgs>>();
+        VerifySolutionBindingRepositoryNoOtherCalls();
+    }
+
     [TestMethod]
     public void Dispose_UnregisterFromSuppressionsUpdateRequestedEvent()
     {
@@ -92,6 +103,17 @@ public void Dispose_UnregisterFromSuppressionsUpdateRequestedEvent()
         VerifyServerIssuesStoreNoOtherCalls();
     }
 
+    [TestMethod]
+    public void Dispose_UnregisterFromBindingDeletedEvent()
+    {
+        solutionBindingRepository.ClearReceivedCalls();
+
+        testSubject.Dispose();
+
+        solutionBindingRepository.Received(1).BindingDeleted -= Arg.Any<EventHandler<LocalBindingKeyEventArgs>>();
+        VerifySolutionBindingRepositoryNoOtherCalls();
+    }
+
     [TestMethod]
     public void OnSuppressionsUpdateRequested_StandaloneMode_StorageFileDeleted()
     {
@@ -196,6 +218,15 @@ public async Task UpdateFileStorage_OnlySuppressedIssuesAreInSettings()
         actualSuppressions[1].RoslynRuleId.Should().Be("S333");
     }
 
+    [TestMethod]
+    public void BindingDeleted_StorageFileDeleted()
+    {
+        var localBindingKey = "my solution name";
+        solutionBindingRepository.BindingDeleted += Raise.EventWith(new LocalBindingKeyEventArgs(localBindingKey));
+
+        roslynSettingsFileStorage.Received(1).Delete(localBindingKey);
+    }
+
     private void MockConfigProvider(BindingConfiguration configuration) => configProvider.GetConfiguration().Returns(configuration);
 
     private void MockServerIssuesStore(IEnumerable<SonarQubeIssue> issues = null) => serverIssuesStore.Get().Returns(issues);
@@ -210,4 +241,5 @@ private static BindingConfiguration CreateConnectedConfiguration(string projectK
     private void MockSolutionInfoProvider(string fullSolutionNameToReturn) => solutionInfoProvider.GetFullSolutionFilePathAsync().Returns(fullSolutionNameToReturn);
 
     private void VerifyServerIssuesStoreNoOtherCalls() => serverIssuesStore.ReceivedCalls().Should().HaveCount(1); // no other calls
+    private void VerifySolutionBindingRepositoryNoOtherCalls() => solutionBindingRepository.ReceivedCalls().Should().HaveCount(1); // no other calls
 }
diff --git a/src/Roslyn.Suppressions/Roslyn.Suppressions/InProcess/RoslynSettingsFileSynchronizer.cs b/src/Roslyn.Suppressions/Roslyn.Suppressions/InProcess/RoslynSettingsFileSynchronizer.cs
index 064a65967..e423a9ae8 100644
--- a/src/Roslyn.Suppressions/Roslyn.Suppressions/InProcess/RoslynSettingsFileSynchronizer.cs
+++ b/src/Roslyn.Suppressions/Roslyn.Suppressions/InProcess/RoslynSettingsFileSynchronizer.cs
@@ -49,6 +49,7 @@ internal sealed class RoslynSettingsFileSynchronizer : IRoslynSettingsFileSynchr
     private readonly IRoslynSettingsFileStorage roslynSettingsFileStorage;
     private readonly IServerIssuesStore serverIssuesStore;
     private readonly ISolutionInfoProvider solutionInfoProvider;
+    private readonly ISolutionBindingRepository solutionBindingRepository;
     private readonly IThreadHandling threadHandling;
 
     [ImportingConstructor]
@@ -57,11 +58,13 @@ public RoslynSettingsFileSynchronizer(
         IRoslynSettingsFileStorage roslynSettingsFileStorage,
         IConfigurationProvider configurationProvider,
         ISolutionInfoProvider solutionInfoProvider,
+        ISolutionBindingRepository solutionBindingRepository,
         ILogger logger)
         : this(serverIssuesStore,
             roslynSettingsFileStorage,
             configurationProvider,
             solutionInfoProvider,
+            solutionBindingRepository,
             logger,
             ThreadHandling.Instance)
     {
@@ -72,6 +75,7 @@ internal RoslynSettingsFileSynchronizer(
         IRoslynSettingsFileStorage roslynSettingsFileStorage,
         IConfigurationProvider configurationProvider,
         ISolutionInfoProvider solutionInfoProvider,
+        ISolutionBindingRepository solutionBindingRepository,
         ILogger logger,
         IThreadHandling threadHandling)
     {
@@ -79,12 +83,16 @@ internal RoslynSettingsFileSynchronizer(
         this.roslynSettingsFileStorage = roslynSettingsFileStorage;
         this.configurationProvider = configurationProvider;
         this.solutionInfoProvider = solutionInfoProvider;
+        this.solutionBindingRepository = solutionBindingRepository;
         this.logger = logger;
         this.threadHandling = threadHandling;
 
         serverIssuesStore.ServerIssuesChanged += OnServerIssuesChanged;
+        solutionBindingRepository.BindingDeleted += OnBindingDeleted;
     }
 
+    private void OnBindingDeleted(object sender, LocalBindingKeyEventArgs e) => roslynSettingsFileStorage.Delete(e.LocalBindingKey);
+
     /// <summary>
     /// Updates the Roslyn suppressed issues file if in connected mode
     /// </summary>
@@ -125,7 +133,11 @@ public async Task UpdateFileStorageAsync()
         }
     }
 
-    public void Dispose() => serverIssuesStore.ServerIssuesChanged -= OnServerIssuesChanged;
+    public void Dispose()
+    {
+        serverIssuesStore.ServerIssuesChanged -= OnServerIssuesChanged;
+        solutionBindingRepository.BindingDeleted -= OnBindingDeleted;
+    }
 
     private void OnServerIssuesChanged(object sender, EventArgs e)
     {