Index: gtkhid-cairo.c
===================================================================
--- gtkhid-cairo.c	(revision 8606)
+++ gtkhid-cairo.c	(revision 8607)
@@ -141,14 +141,11 @@
 		idx = PCB->LayerGroups.grp[group].lid[idx];
 	}
 
-	/* non-virtual layers with special visibility */
+	/* non-virtual layers with group visibility */
 	switch (flags & PCB_LYT_ANYTHING) {
-	case PCB_LYT_MASK:
-		if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags) /*&& !pinout */ )
-			return pcb_mask_on(PCB);
-		return 0;
-	case PCB_LYT_PASTE:					/* Never draw the paste layer */
-		return 0;
+		case PCB_LYT_MASK:
+		case PCB_LYT_PASTE:
+			return (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags) && PCB->LayerGroups.grp[group].vis /*&& !pinout */ );
 	}
 
 	if (idx >= 0 && idx < pcb_max_layer && ((flags & PCB_LYT_ANYTHING) != PCB_LYT_SILK))