diff --git a/src/controllers/GroupsController.ts b/src/controllers/GroupsController.ts
index 6b0f632..bcb6f8b 100644
--- a/src/controllers/GroupsController.ts
+++ b/src/controllers/GroupsController.ts
@@ -328,6 +328,10 @@ export class GroupsController {
 		// Respond to the invitation
 		await GroupsHelper.RespondInvitation(groupID, h.getUserId(), accept);
 
+		// Mark automatically the user as following if he accepted the invitation
+		if(accept)
+			await GroupsHelper.SetFollowing(groupID, h.getUserId(), true);
+
 		// Create a notification
 		await NotificationsHelper.CreateGroupMembershipNotification(
 			h.getUserId(), 0, groupID,