diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router.js b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
index 853e574..6a0cf8d 100644
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.js
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
@@ -239,7 +239,7 @@
     });
 
     // Matches /admin/groups/<group>
-    page(/^\/admin\/groups\/(.+)$/, loadUser, data => {
+    page(/^\/admin\/groups\/([^,]+)$/, loadUser, data => {
       restAPI.getLoggedIn().then(loggedIn => {
         if (loggedIn) {
           app.params = {
@@ -351,7 +351,7 @@
     });
 
     // Matches /admin/projects/<project>
-    page(/^\/admin\/projects\/(.+)$/, loadUser, data => {
+    page(/^\/admin\/projects\/([^,]+)$/, loadUser, data => {
       app.params = {
         view: Gerrit.Nav.View.ADMIN,
         project: data.params[0],