diff --git a/hypha/apply/activity/models.py b/hypha/apply/activity/models.py
index d0fe8c36bc837f12d137f00aa2546c8b27b5f5cf..016b3d311469ff597e030aaf5cb5ecc6f830a989 100644
--- a/hypha/apply/activity/models.py
+++ b/hypha/apply/activity/models.py
@@ -224,7 +224,7 @@ class Activity(models.Model):
             A list of visibility strings
         """
         if user.is_apply_staff:
-            return [TEAM, APPLICANT, REVIEWER, PARTNER, ALL]
+            return [TEAM, APPLICANT, REVIEWER, APPLICANT_PARTNERS, PARTNER, ALL]
         if user.is_reviewer:
             return [REVIEWER, ALL]
         if user.is_finance or user.is_contracting:
@@ -259,25 +259,6 @@ class Activity(models.Model):
         """
         has_partner = submission_partner_list and len(submission_partner_list) > 0
 
-        if user.is_partner and has_partner and submission_partner_list.contains(user):
-            return [
-                (APPLICANT_PARTNERS, VISIBILITY[APPLICANT_PARTNERS]),
-                (PARTNER, VISIBILITY[PARTNER]),
-                (TEAM, VISIBILITY[TEAM]),
-            ]
-
-        if user.is_applicant and has_partner:
-            return [
-                (APPLICANT_PARTNERS, VISIBILITY[PARTNER]),
-                (APPLICANT, VISIBILITY[TEAM]),
-            ]
-
-        if user.is_applicant:
-            return [(APPLICANT, VISIBILITY[APPLICANT])]
-
-        if user.is_reviewer:
-            return [(REVIEWER, VISIBILITY[REVIEWER])]
-
         if user.is_apply_staff:
             if not has_partner:
                 choices = [
@@ -295,9 +276,27 @@ class Activity(models.Model):
                     (REVIEWER, VISIBILITY[REVIEWER]),
                     (ALL, VISIBILITY[ALL]),
                 ]
-
             return choices
 
+        if user.is_partner and has_partner and submission_partner_list.contains(user):
+            return [
+                (APPLICANT_PARTNERS, VISIBILITY[APPLICANT_PARTNERS]),
+                (PARTNER, VISIBILITY[PARTNER]),
+                (TEAM, VISIBILITY[TEAM]),
+            ]
+
+        if user.is_applicant and has_partner:
+            return [
+                (APPLICANT_PARTNERS, VISIBILITY[PARTNER]),
+                (APPLICANT, VISIBILITY[TEAM]),
+            ]
+
+        if user.is_applicant:
+            return [(APPLICANT, VISIBILITY[APPLICANT])]
+
+        if user.is_reviewer:
+            return [(REVIEWER, VISIBILITY[REVIEWER])]
+
         if user.is_finance or user.is_contracting:
             return [(TEAM, VISIBILITY[TEAM]), (APPLICANT, VISIBILITY[APPLICANT])]