diff --git a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
index 674ff7c6c7e58ca825df4c75f02ab44fd8e7cc91..bf3ce6d5e95baa297747208cd76c27de05d0843e 100644
--- a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
@@ -134,6 +134,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.SeparatorCopyPaste); //mxd
 			General.Interface.RemoveButton(BuilderPlug.Me.MenusForm.AlignThingsToWall); //mxd
 			
+			//mxd. Do some highlight management...
+			if(highlighted != null) highlighted.Highlighted = false;
+
 			// Going to EditSelectionMode?
 			if(General.Editing.NewMode is EditSelectionMode)
 			{
@@ -149,10 +152,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
 					}
 				}
 			} 
-			else if(highlighted != null) //mxd
-			{
-				highlighted.Highlighted = false;
-			}
 
 			// Hide highlight info and tooltip
 			General.Interface.HideInfo();
@@ -706,14 +705,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			return base.OnCopyBegin();
 		}
 
-		//mxd. Needs more highlight management...
-		public override bool OnPasteBegin(PasteOptions options)
-		{
-			bool result = base.OnPasteBegin(options);
-			if(result && highlighted != null) highlighted.Highlighted = false;
-			return result;
-		}
-
 		//mxd
 		public override void UpdateSelectionInfo() 
 		{