diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/AssignParticipantFilter.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/AssignParticipantFilter.java
index d656da8..ebbc9be 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/AssignParticipantFilter.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/filters/AssignParticipantFilter.java
@@ -30,6 +30,8 @@
 import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIContentsContainer;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIFileContext;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIPostponedFile;
+import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIReviewBasic;
+import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIReviewGroup;
 import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIReviewItem;
 
 /**
@@ -83,89 +85,147 @@
 	@Override
 	public boolean select(Viewer aViewer, Object aParentElement, Object aElement) {
 
-		//Only Review elements that are unassigned, or assigned to the participant
-		//and anomalies created by the participant are shown
-		if (aElement instanceof R4EUIReviewItem) {
-			if (0 == ((R4EUIReviewItem) aElement).getItem().getAssignedTo().size()
-					|| ((R4EUIReviewItem) aElement).getItem().getAssignedTo().contains(fParticipant)) {
-				return true;
-			} else {
-				final List<R4EUIFileContext> files = ((R4EUIReviewItem) aElement).getFileContexts();
-				for (R4EUIFileContext file : files) {
-					if (file.getFileContext().getAssignedTo().contains(fParticipant)) {
-						return true;
-					} else {
-						IR4EUIModelElement[] contents = file.getContentsContainerElement().getChildren();
-						for (IR4EUIModelElement content : contents) {
-							if (((R4EUIContent) content).getContent().getAssignedTo().contains(fParticipant)) {
-								return true;
-							}
-						}
-						IR4EUIModelElement[] anomalies = file.getAnomalyContainerElement().getChildren();
-						for (IR4EUIModelElement anomaly : anomalies) {
-							if (((R4EUIAnomalyBasic) anomaly).getAnomaly().getAssignedTo().contains(fParticipant)) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-			return false;
-		} else if (aElement instanceof R4EUIFileContext) {
-			if (aElement instanceof R4EUIPostponedFile) {
-				return true;
-			}
-			if (0 == ((R4EUIFileContext) aElement).getFileContext().getAssignedTo().size()
-					|| ((R4EUIFileContext) aElement).getFileContext().getAssignedTo().contains(fParticipant)) {
-				return true;
-			} else {
-				final IR4EUIModelElement[] contents = ((R4EUIFileContext) aElement).getContentsContainerElement()
-						.getChildren();
-				for (IR4EUIModelElement content : contents) {
-					if (((R4EUIContent) content).getContent().getAssignedTo().contains(fParticipant)) {
-						return true;
-					}
-				}
-				final IR4EUIModelElement[] anomalies = ((R4EUIFileContext) aElement).getAnomalyContainerElement()
-						.getChildren();
-				for (IR4EUIModelElement anomaly : anomalies) {
-					if (((R4EUIAnomalyBasic) anomaly).getAnomaly().getAssignedTo().contains(fParticipant)) {
-						return true;
-					}
-				}
-			}
-			return false;
-		} else if (aElement instanceof R4EUIContent) {
-			if (0 == ((R4EUIContent) aElement).getContent().getAssignedTo().size()
-					|| ((R4EUIContent) aElement).getContent().getAssignedTo().contains(fParticipant)) {
-				return true;
-			}
-			return false;
-		} else if (aElement instanceof R4EUIAnomalyBasic) {
-			if (0 == ((R4EUIAnomalyBasic) aElement).getAnomaly().getAssignedTo().size()
-					|| ((R4EUIAnomalyBasic) aElement).getAnomaly().getAssignedTo().contains(fParticipant)
-					|| ((R4EUIAnomalyBasic) aElement).getAnomaly().getAuthor().getId().equals(fParticipant)) {
-				return true;
-			}
-			return false;
-		} else if (aElement instanceof R4EUIContentsContainer) {
-			for (IR4EUIModelElement child : ((R4EUIContentsContainer) aElement).getChildren()) {
-				if (0 == ((R4EUIContent) child).getContent().getAssignedTo().size()
-						|| ((R4EUIContent) child).getContent().getAssignedTo().contains(fParticipant)) {
-					return true;
-				}
-			}
-			return false;
-		} else if (aElement instanceof R4EUIAnomalyContainer) {
-			for (IR4EUIModelElement child : ((R4EUIAnomalyContainer) aElement).getChildren()) {
-				if (0 == ((R4EUIAnomalyBasic) child).getAnomaly().getAssignedTo().size()
-						|| ((R4EUIAnomalyBasic) child).getAnomaly().getAssignedTo().contains(fParticipant)
-						|| ((R4EUIAnomalyBasic) child).getAnomaly().getAuthor().getId().equals(fParticipant)) {
-					return true;
-				}
-			}
-			return false;
+		//Always show Regiew Group and Reviews
+		if (aElement instanceof R4EUIReviewGroup || aElement instanceof R4EUIReviewBasic) {
+			return true;
 		}
-		return true;
+
+		//Only consider the Reviews that the user is a participant of
+		if (isParentReviewParticipant((IR4EUIModelElement) aElement)
+				|| isChildrenReviewParticipant((IR4EUIModelElement) aElement)) {
+
+			//Only Review elements that are unassigned, or assigned to the participant
+			//and anomalies created by the participant are shown
+			if (aElement instanceof R4EUIReviewItem) {
+				if (0 == ((R4EUIReviewItem) aElement).getItem().getAssignedTo().size()
+						|| ((R4EUIReviewItem) aElement).getItem().getAssignedTo().contains(fParticipant)) {
+					return true;
+				} else {
+					final List<R4EUIFileContext> files = ((R4EUIReviewItem) aElement).getFileContexts();
+					for (R4EUIFileContext file : files) {
+						if (file.getFileContext().getAssignedTo().contains(fParticipant)) {
+							return true;
+						} else {
+							IR4EUIModelElement[] contents = file.getContentsContainerElement().getChildren();
+							for (IR4EUIModelElement content : contents) {
+								if (((R4EUIContent) content).getContent().getAssignedTo().contains(fParticipant)) {
+									return true;
+								}
+							}
+							IR4EUIModelElement[] anomalies = file.getAnomalyContainerElement().getChildren();
+							for (IR4EUIModelElement anomaly : anomalies) {
+								if (((R4EUIAnomalyBasic) anomaly).getAnomaly().getAssignedTo().contains(fParticipant)) {
+									return true;
+								}
+							}
+						}
+					}
+				}
+				return false;
+			} else if (aElement instanceof R4EUIFileContext) {
+				if (aElement instanceof R4EUIPostponedFile) {
+					return true;
+				}
+				if (0 == ((R4EUIFileContext) aElement).getFileContext().getAssignedTo().size()
+						|| ((R4EUIFileContext) aElement).getFileContext().getAssignedTo().contains(fParticipant)) {
+					return true;
+				} else {
+					final IR4EUIModelElement[] contents = ((R4EUIFileContext) aElement).getContentsContainerElement()
+							.getChildren();
+					for (IR4EUIModelElement content : contents) {
+						if (((R4EUIContent) content).getContent().getAssignedTo().contains(fParticipant)) {
+							return true;
+						}
+					}
+					final IR4EUIModelElement[] anomalies = ((R4EUIFileContext) aElement).getAnomalyContainerElement()
+							.getChildren();
+					for (IR4EUIModelElement anomaly : anomalies) {
+						if (((R4EUIAnomalyBasic) anomaly).getAnomaly().getAssignedTo().contains(fParticipant)) {
+							return true;
+						}
+					}
+				}
+				return false;
+			} else if (aElement instanceof R4EUIContent) {
+				if (0 == ((R4EUIContent) aElement).getContent().getAssignedTo().size()
+						|| ((R4EUIContent) aElement).getContent().getAssignedTo().contains(fParticipant)) {
+					return true;
+				}
+				return false;
+			} else if (aElement instanceof R4EUIAnomalyBasic) {
+				if (0 == ((R4EUIAnomalyBasic) aElement).getAnomaly().getAssignedTo().size()
+						|| ((R4EUIAnomalyBasic) aElement).getAnomaly().getAssignedTo().contains(fParticipant)
+					|| ((R4EUIAnomalyBasic) aElement).getAnomaly().getAuthor().getId().equals(fParticipant)) {
+					return true;
+				}
+				return false;
+			} else if (aElement instanceof R4EUIContentsContainer) {
+				for (IR4EUIModelElement child : ((R4EUIContentsContainer) aElement).getChildren()) {
+					if (0 == ((R4EUIContent) child).getContent().getAssignedTo().size()
+							|| ((R4EUIContent) child).getContent().getAssignedTo().contains(fParticipant)) {
+						return true;
+					}
+				}
+				return false;
+			} else if (aElement instanceof R4EUIAnomalyContainer) {
+				for (IR4EUIModelElement child : ((R4EUIAnomalyContainer) aElement).getChildren()) {
+					if (0 == ((R4EUIAnomalyBasic) child).getAnomaly().getAssignedTo().size()
+							|| ((R4EUIAnomalyBasic) child).getAnomaly().getAssignedTo().contains(fParticipant)
+						|| ((R4EUIAnomalyBasic) child).getAnomaly().getAuthor().getId().equals(fParticipant)) {
+						return true;
+					}
+				}
+				return false;
+			}
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if the children element contains the current participant
+	 * 
+	 * @param aCurrentElement
+	 *            - the element to filter on
+	 * @return true/false
+	 */
+	private boolean isChildrenReviewParticipant(IR4EUIModelElement aCurrentElement) {
+		final int length = aCurrentElement.getChildren().length;
+		IR4EUIModelElement element = null;
+		for (int i = 0; i < length; i++) {
+			element = aCurrentElement.getChildren()[i];
+			if (!(element instanceof R4EUIReviewBasic)) {
+				return false;
+			}
+			if (((R4EUIReviewBasic) element).isParticipant(fParticipant)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if the parent element contains the current participant
+	 * 
+	 * @param aCurrentElement
+	 *            - the element to filter on
+	 * @return true/false
+	 */
+	private boolean isParentReviewParticipant(IR4EUIModelElement aCurrentElement) {
+
+		//Get Review parent
+		IR4EUIModelElement reviewParentElement = aCurrentElement;
+		while (!(reviewParentElement instanceof R4EUIReviewBasic)) {
+			reviewParentElement = reviewParentElement.getParent();
+			if (null == reviewParentElement) {
+				return false;
+			}
+		}
+
+		//Check if we are a participant for this review
+		if (((R4EUIReviewBasic) reviewParentElement).isParticipant(fParticipant)) {
+			return true;
+		}
+		return false;
 	}
 }