diff --git a/Source/Plugins/GZDoomEditing/VisualModes/VisualCeiling.cs b/Source/Plugins/GZDoomEditing/VisualModes/VisualCeiling.cs
index ceb1b3a3..a7c4829d 100644
--- a/Source/Plugins/GZDoomEditing/VisualModes/VisualCeiling.cs
+++ b/Source/Plugins/GZDoomEditing/VisualModes/VisualCeiling.cs
@@ -128,12 +128,19 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 			// the triangles upside down.
 			if((extrafloor == null) || extrafloor.VavoomType)
 				SwapTriangleVertices(verts);
-			
+
 			// Determine render pass
-			if(level.alpha < 255)
-				this.RenderPass = RenderPass.Alpha;
+			if(extrafloor != null)
+			{
+				if(level.alpha < 255)
+					this.RenderPass = RenderPass.Alpha;
+				else
+					this.RenderPass = RenderPass.Mask;
+			}
 			else
+			{
 				this.RenderPass = RenderPass.Solid;
+			}
 			
 			// Apply vertices
 			base.SetVertices(verts);
diff --git a/Source/Plugins/GZDoomEditing/VisualModes/VisualFloor.cs b/Source/Plugins/GZDoomEditing/VisualModes/VisualFloor.cs
index f3350b11..667e8e40 100644
--- a/Source/Plugins/GZDoomEditing/VisualModes/VisualFloor.cs
+++ b/Source/Plugins/GZDoomEditing/VisualModes/VisualFloor.cs
@@ -129,10 +129,17 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 				SwapTriangleVertices(verts);
 			
 			// Determine render pass
-			if(level.alpha < 255)
-				this.RenderPass = RenderPass.Alpha;
+			if(extrafloor != null)
+			{
+				if(level.alpha < 255)
+					this.RenderPass = RenderPass.Alpha;
+				else
+					this.RenderPass = RenderPass.Mask;
+			}
 			else
+			{
 				this.RenderPass = RenderPass.Solid;
+			}
 			
 			// Apply vertices
 			base.SetVertices(verts);
diff --git a/Source/Plugins/GZDoomEditing/VisualModes/VisualMiddle3D.cs b/Source/Plugins/GZDoomEditing/VisualModes/VisualMiddle3D.cs
index 4508c13a..a0413e66 100644
--- a/Source/Plugins/GZDoomEditing/VisualModes/VisualMiddle3D.cs
+++ b/Source/Plugins/GZDoomEditing/VisualModes/VisualMiddle3D.cs
@@ -255,7 +255,7 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 					}
 					else
 					{
-						this.RenderPass = RenderPass.Solid;
+						this.RenderPass = RenderPass.Mask;
 					}
 					
 					base.SetVertices(verts);
diff --git a/Tests/UDMF/udmfexample.wad b/Tests/UDMF/udmfexample.wad
index d484a104..95599e57 100644
Binary files a/Tests/UDMF/udmfexample.wad and b/Tests/UDMF/udmfexample.wad differ