diff --git a/src/servers/notification/AppGroupView.cpp b/src/servers/notification/AppGroupView.cpp
index e1f36da458..444e4061d0 100644
--- a/src/servers/notification/AppGroupView.cpp
+++ b/src/servers/notification/AppGroupView.cpp
@@ -238,6 +238,9 @@ AppGroupView::AddInfo(NotificationView* view)
 
 		for (int32 i = 0; i < children; i++) {
 			if (id == fInfo[i]->MessageID()) {
+				// TODO: because NotificationWindow also tracks these
+				// views, we may be heading towards a use-after-free with
+				// this code.
 				GetLayout()->RemoveView(fInfo[i]);
 				delete fInfo[i];