diff --git a/cms/static/js/xblock/authoring.js b/cms/static/js/xblock/authoring.js
index 5cb7bf288c..36140b6f76 100644
--- a/cms/static/js/xblock/authoring.js
+++ b/cms/static/js/xblock/authoring.js
@@ -14,7 +14,7 @@
             // Get the selected user partition (only allowed to select one).
             partitionId = parseInt(element.find('.partition-visibility select').val(), 10);
 
-            // "All Learners and Staff" is selected (or "Choose one", which is only shown when
+            // "All Learners and Staff" is selected (or "Select a group type", which is only shown when
             // current visibility is "All Learners and Staff" at the time the dialog is opened).
             if (partitionId === -1) {
                 return {};
diff --git a/cms/templates/visibility_editor.html b/cms/templates/visibility_editor.html
index 2d66dc4a08..7b15cc91ff 100644
--- a/cms/templates/visibility_editor.html
+++ b/cms/templates/visibility_editor.html
@@ -67,7 +67,7 @@ is_staff_locked = ancestor_has_staff_lock(xblock)
                     <select>
                         <option value="-1" selected ="selected">
                             % if selected_partition_index == -1:
-                                ${_('Choose one')}
+                                ${_('Select a group type')}
                             % else:
                                 ${_('All Learners and Staff')}
                             % endif
diff --git a/common/test/acceptance/tests/studio/test_studio_container.py b/common/test/acceptance/tests/studio/test_studio_container.py
index 4b1340970d..8ba505561e 100644
--- a/common/test/acceptance/tests/studio/test_studio_container.py
+++ b/common/test/acceptance/tests/studio/test_studio_container.py
@@ -319,7 +319,7 @@ class EditContainerTest(NestedVerticalTest):
 
 class BaseGroupConfigurationsTest(ContainerBase):
     ALL_LEARNERS_AND_STAFF = ComponentVisibilityEditorView.ALL_LEARNERS_AND_STAFF
-    CHOOSE_ONE = "Choose one"
+    CHOOSE_ONE = "Select a group type"
     CONTENT_GROUP_PARTITION = ComponentVisibilityEditorView.CONTENT_GROUP_PARTITION
     ENROLLMENT_TRACK_PARTITION = ComponentVisibilityEditorView.ENROLLMENT_TRACK_PARTITION
     MISSING_GROUP_LABEL = 'Deleted Group\nThis group no longer exists. Choose another group or make this component visible to All Learners and Staff.'
@@ -405,7 +405,7 @@ class BaseGroupConfigurationsTest(ContainerBase):
         visibility_editor.select_groups_in_partition_scheme(partition_label, groups)
 
         # Re-open the modal and inspect its selected inputs. If no groups were selected,
-        # "All Learners" should be selected partitions scheme, and we show "Choose one" in the select.
+        # "All Learners" should be selected partitions scheme, and we show "Select a group type" in the select.
         if not groups:
             partition_label = self.CHOOSE_ONE
         visibility_editor = self.edit_component_visibility(component)