diff --git a/Subsurface/Source/Screens/EditMapScreen.cs b/Subsurface/Source/Screens/EditMapScreen.cs
index d27dba525..4d0d2bce9 100644
--- a/Subsurface/Source/Screens/EditMapScreen.cs
+++ b/Subsurface/Source/Screens/EditMapScreen.cs
@@ -672,6 +672,8 @@ namespace Barotrauma
             {
                 me.IsHighlighted = false;
             }
+
+            MapEntity.DeselectAll();
             
             return true;
         }
@@ -687,7 +689,6 @@ namespace Barotrauma
 
             characterMode = false;
 
-
             if (wiringMode)
             {
                 CreateDummyCharacter();
@@ -704,6 +705,8 @@ namespace Barotrauma
             {
                 RemoveDummyCharacter();
             }
+
+            MapEntity.DeselectAll();
             
             return true;
         }
@@ -944,7 +947,7 @@ namespace Barotrauma
                         me.IsHighlighted = false;
                     }
 
-                    if (wiringMode)
+                    if (wiringMode && dummyCharacter.SelectedConstruction==null)
                     {
                         List<Wire> wires = new List<Wire>();
                         foreach (Item item in Item.ItemList)