diff --git a/block_completion_progress.php b/block_completion_progress.php
index 57f01e7a05..35e2436267 100644
--- a/block_completion_progress.php
+++ b/block_completion_progress.php
@@ -290,6 +290,14 @@ protected function prepare_course_content(&$barinstances) {
         // Allow teachers to access the overview page.
         if (has_capability('block/completion_progress:overview', $this->context)) {
             $parameters = ['instanceid' => $this->instance->id, 'courseid' => $COURSE->id];
+            if(!empty($this->config->preselectgroup) && !empty($this->config->group)){
+                $group = $this->config->group;
+                if (substr($group, 0, 6) === 'group-') {
+                    $parameters['group'] = substr($group, 6);
+                } elseif (substr($group, 0, 9) === 'grouping-') {
+                    $parameters['group'] = 'g' . substr($group, 9);
+                }
+            }
             $url = new moodle_url('/blocks/completion_progress/overview.php', $parameters);
             $label = get_string('overview', 'block_completion_progress');
             $options = ['class' => 'overviewButton'];
diff --git a/edit_form.php b/edit_form.php
index 3456571612..0dac5fa044 100644
--- a/edit_form.php
+++ b/edit_form.php
@@ -128,6 +128,11 @@ protected function specific_definition($mform) {
             $mform->setAdvanced('config_group', true);
         }
 
+        $mform->addElement('advcheckbox', 'config_preselectgroup',
+                           get_string('config_preselectgroup', 'block_completion_progress'), ' ');
+        $mform->hideif('config_preselectgroup', 'config_group', 'eq', '0');
+        $mform->setAdvanced('config_preselectgroup', true);
+
         // Set block instance title.
         $mform->addElement('text', 'config_progressTitle',
                            get_string('config_title', 'block_completion_progress'));
diff --git a/lang/en/block_completion_progress.php b/lang/en/block_completion_progress.php
index aaa30e5d4d..e366266465 100644
--- a/lang/en/block_completion_progress.php
+++ b/lang/en/block_completion_progress.php
@@ -42,6 +42,7 @@
 $string['config_orderby_course_order'] = 'Ordering in course';
 $string['config_orderby_due_time'] = 'Time using "{$a}" date';
 $string['config_percentage'] = 'Show percentage to students';
+$string['config_preselectgroup'] = 'Preselect group/grouping on overview page';
 $string['config_scroll'] = 'Scroll';
 $string['config_selectactivities'] = 'Select activities';
 $string['config_selectedactivities'] = 'Selected activities';