diff --git a/Source/automap.cpp b/Source/automap.cpp
index de22aaf52..044f8f93b 100644
--- a/Source/automap.cpp
+++ b/Source/automap.cpp
@@ -293,19 +293,19 @@ void DrawAutomapType(int sx, int sy, WORD automap_type)
 		DrawLine(sx, y1, x2, y2, COLOR_DIM);
 		DrawLine(sx, sy, x1, y2, COLOR_DIM);
 		DrawLine(sx, sy, x2, y2, COLOR_DIM);
-		return;
+		break;
 	case 2:
 	case 5:
 		do_vert = TRUE;
 		break;
-	case 4:
-		do_vert = TRUE;
-		do_horz = TRUE;
-		break;
 	case 3:
 	case 6:
 		do_horz = TRUE;
 		break;
+	case 4:
+		do_vert = TRUE;
+		do_horz = TRUE;
+		break;
 	case 8:
 		do_vert = TRUE;
 		do_cave_horz = TRUE;