Index: Core/Components/src/Core.Components.GraphSharp/Commands/VertexSelectedCommand.cs
===================================================================
diff -u -r2c5e077a0f546af6d6379eb93111fd8366fc2224 -r82a8d66366233f3d54c22fe7fb73b71f603baf9e
--- Core/Components/src/Core.Components.GraphSharp/Commands/VertexSelectedCommand.cs	(.../VertexSelectedCommand.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
+++ Core/Components/src/Core.Components.GraphSharp/Commands/VertexSelectedCommand.cs	(.../VertexSelectedCommand.cs)	(revision 82a8d66366233f3d54c22fe7fb73b71f603baf9e)
@@ -32,7 +32,17 @@
     {
         private readonly PointedTreeElementVertex vertex;
 
-        public event EventHandler CanExecuteChanged;
+        public event EventHandler CanExecuteChanged
+        {
+            add
+            {
+                CommandManager.RequerySuggested += value;
+            }
+            remove
+            {
+                CommandManager.RequerySuggested -= value;
+            }
+        }
 
         /// <summary>
         /// Creates a new instance of <see cref="VertexSelectedCommand"/>.
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/BackgroundMapDataSelectionControlTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r82a8d66366233f3d54c22fe7fb73b71f603baf9e
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/BackgroundMapDataSelectionControlTest.cs	(.../BackgroundMapDataSelectionControlTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/BackgroundMapDataSelectionControlTest.cs	(.../BackgroundMapDataSelectionControlTest.cs)	(revision 82a8d66366233f3d54c22fe7fb73b71f603baf9e)
@@ -33,17 +33,25 @@
         [Test]
         public void Constructor_ExpectedValues()
         {
+            // Setup
+            const string name = "Random display name";
+
             // Call
-            var backgroundMapDataSelectionControl = new TestBackgroundMapDataSelectionControl("Random display name");
+            var backgroundMapDataSelectionControl = new TestBackgroundMapDataSelectionControl(name);
 
             // Assert
             Assert.IsInstanceOf<UserControl>(backgroundMapDataSelectionControl);
-            Assert.AreEqual("Random display name", backgroundMapDataSelectionControl.DisplayName);
+            Assert.AreEqual(name, backgroundMapDataSelectionControl.DisplayName);
+            Assert.IsNull(backgroundMapDataSelectionControl.SelectedMapData);
         }
 
         private class TestBackgroundMapDataSelectionControl : BackgroundMapDataSelectionControl
         {
-            public override event EventHandler<EventArgs> SelectedMapDataChanged;
+            public override event EventHandler<EventArgs> SelectedMapDataChanged
+            {
+                add {}
+                remove {}
+            }
 
             public TestBackgroundMapDataSelectionControl(string displayName)
                 : base(displayName) {}