diff --git a/Source/Map/Linedef.cs b/Source/Map/Linedef.cs
index c146a812..7d8729b8 100644
--- a/Source/Map/Linedef.cs
+++ b/Source/Map/Linedef.cs
@@ -117,6 +117,7 @@ namespace CodeImp.DoomBuilder.Map
 			this.start = start;
 			this.end = end;
 			this.updateneeded = true;
+			this.args = new byte[NUM_ARGS];
 			
 			// Attach to vertices
 			startvertexlistitem = start.AttachLinedef(this);
@@ -481,6 +482,7 @@ namespace CodeImp.DoomBuilder.Map
 			nl = map.CreateLinedef(v, end);
 			CopyPropertiesTo(nl);
 			SetEndVertex(v);
+			nl.selected = this.selected;
 
 			// Copy front sidedef if exists
 			if(front != null)
diff --git a/Source/Map/Vertex.cs b/Source/Map/Vertex.cs
index 92bb597d..9b2fa1ad 100644
--- a/Source/Map/Vertex.cs
+++ b/Source/Map/Vertex.cs
@@ -246,6 +246,9 @@ namespace CodeImp.DoomBuilder.Map
 				current = previous;
 			}
 
+			// If either of the two vertices was selected, keep the other selected
+			if(this.selected) other.selected = true;
+
 			// Remove this vertex
 			this.Dispose();
 		}