diff --git a/Source/Plugins/BuilderModes/ClassicModes/BrightnessMode.cs b/Source/Plugins/BuilderModes/ClassicModes/BrightnessMode.cs
index 2f41b88e68d8b991c7682c33af006fa731edb2f0..f6856aec7ddb4bdcb90ff6219059bc05002b3235 100644
--- a/Source/Plugins/BuilderModes/ClassicModes/BrightnessMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/BrightnessMode.cs
@@ -674,7 +674,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			{
 				// Make the highlight a selection if we have a highlight
 				if((highlighted != null) && !highlighted.IsDisposed)
+				{
 					SelectSector(highlighted, true, false);
+					orderedselection.Add(highlighted);
+				}
 			}
 			
 			// Anything selected?
diff --git a/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs b/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs
index f3a3d623495625040ae7f782aff86a66af4b6c1a..4599da10c2908a0a64d4d973cc5c1aa8e3c5f9b5 100644
--- a/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/EditSelectionMode.cs
@@ -951,6 +951,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				modealreadyswitching = true;
 				this.OnAccept();
 			}
+
+			// Update
+			General.Map.ThingsFilter.Update();
+			General.Interface.RedrawDisplay();
 			
 			// Hide highlight info
 			General.Interface.HideInfo();
diff --git a/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs
index 9366763ced9183a36458fae72e6b607558f7afa7..d59a3f48fa038208a0d1450a1c9227fb85f033f7 100644
--- a/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/LinedefsMode.cs
@@ -519,19 +519,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			return base.OnCopyBegin();
 		}
 
-		// When pasting
-		public override bool OnPasteBegin()
-		{
-			// No selection made? But we have a highlight!
-			if((General.Map.Map.GetSelectedLinedefs(true).Count == 0) && (highlighted != null))
-			{
-				// Make the highlight the selection
-				highlighted.Selected = true;
-			}
-
-			return base.OnPasteBegin();
-		}
-		
 		#endregion
 
 		#region ================== Actions
diff --git a/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs
index 51bdd887d4eac964f9c1bda3a0faafb80b5bd01f..973170e79e2c15f96433638af23796ea31d94fb3 100644
--- a/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/SectorsMode.cs
@@ -797,19 +797,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			return base.OnCopyBegin();
 		}
 
-		// When pasting
-		public override bool OnPasteBegin()
-		{
-			// No selection made? But we have a highlight!
-			if((General.Map.Map.GetSelectedSectors(true).Count == 0) && (highlighted != null))
-			{
-				// Make the highlight the selection
-				SelectSector(highlighted, true, true);
-			}
-
-			return base.OnPasteBegin();
-		}
-
 		// When undo is used
 		public override bool OnUndoBegin()
 		{
diff --git a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
index a626ccae298a3d6eb74d272be2a3edcf0c96f21b..f3bbf80182ed989f5637e411e043b12f0b424a88 100644
--- a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
@@ -498,19 +498,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			return base.OnCopyBegin();
 		}
 
-		// When pasting
-		public override bool OnPasteBegin()
-		{
-			// No selection made? But we have a highlight!
-			if((General.Map.Map.GetSelectedThings(true).Count == 0) && (highlighted != null))
-			{
-				// Make the highlight the selection
-				highlighted.Selected = true;
-			}
-
-			return base.OnPasteBegin();
-		}
-		
 		#endregion
 
 		#region ================== Actions
diff --git a/Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs b/Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs
index 836442d4aff3192058e473c2f6ca17b5631a7e3f..f03b4eeff94f6278191d8c73ea16a47ec681594b 100644
--- a/Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/VerticesMode.cs
@@ -466,19 +466,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			return base.OnCopyBegin();
 		}
 		
-		// When pasting
-		public override bool OnPasteBegin()
-		{
-			// No selection made? But we have a highlight!
-			if((General.Map.Map.GetSelectedVertices(true).Count == 0) && (highlighted != null))
-			{
-				// Make the highlight the selection
-				highlighted.Selected = true;
-			}
-			
-			return base.OnPasteBegin();
-		}
-		
 		#endregion
 
 		#region ================== Actions