diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php
index 0f625c4..4d1aa28 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php
@@ -34,8 +34,7 @@ public function getValueOptions() {
     foreach ($modules as $module => $display_name) {
       if ($permissions = module_invoke($module, 'permission')) {
         foreach ($permissions as $perm => $perm_item) {
-          // @todo: group by module but views_handler_filter_many_to_one does not support this.
-          $this->value_options[$perm] = check_plain(strip_tags($perm_item['title']));
+          $this->value_options[$display_name][$perm] = check_plain(strip_tags($perm_item['title']));
         }
       }
     }