diff --git a/CentrED/Map/MapManager.cs b/CentrED/Map/MapManager.cs
index a0e7297..18a5225 100644
--- a/CentrED/Map/MapManager.cs
+++ b/CentrED/Map/MapManager.cs
@@ -461,15 +461,16 @@ public void Update(GameTime gameTime, bool isActive, bool processMouse, bool pro
             {
                 _mouseDrag = false;
             }
+            if ( _prevMouseState.LeftButton == ButtonState.Pressed && mouseState.LeftButton == ButtonState.Released)
+            {
+                ActiveTool.OnMouseReleased(Selected);
+                Selected = null; //Very dirty way to retrigger OnMouseEnter() after something presumably changed
+            }
         }
         else
         {
             ActiveTool.OnMouseLeave(Selected);
         }
-        if ( _prevMouseState.LeftButton == ButtonState.Pressed && mouseState.LeftButton == ButtonState.Released)
-        {
-            ActiveTool.OnMouseReleased(Selected);
-        }
         _prevMouseState = mouseState;
 
         if (isActive && processKeyboard)