diff --git a/combo/manager/forms.py b/combo/manager/forms.py
index 1767e659..9ca54414 100644
--- a/combo/manager/forms.py
+++ b/combo/manager/forms.py
@@ -26,6 +26,10 @@ from combo.data.models import Page
 from .fields import ImageIncludingSvgField
 
 
+def get_groups_as_choices():
+    return [(x.id, x.name) for x in Group.objects.all().order_by('name')]
+
+
 class PageEditTitleForm(forms.ModelForm):
     class Meta:
         model = Page
@@ -61,6 +65,11 @@ class PageEditPictureForm(forms.ModelForm):
 
 
 class PageVisibilityForm(forms.ModelForm):
+    groups = forms.MultipleChoiceField(
+            label=_('Groups'),
+            required=False,
+            choices=get_groups_as_choices)
+
     class Meta:
         model = Page
         fields = ('public', 'groups')
@@ -105,10 +114,6 @@ class PageEditExcludeFromNavigationForm(forms.ModelForm):
         fields = ('exclude_from_navigation',)
 
 
-def get_groups_as_choices():
-    return [(x.id, x.name) for x in Group.objects.all().order_by('name')]
-
-
 class CellVisibilityForm(forms.Form):
     visibility = forms.ChoiceField(
             label=_('Visibility'),