diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
index d7db9acf2c..e72e127619 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
@@ -434,8 +434,8 @@ public class Dispatcher {
         }
         c = dashboardId.indexOf(":");
         if (0 <= c) {
-          final String ref = URL.decode(dashboardId.substring(0, c));
-          final String path = URL.decode(dashboardId.substring(c + 1));
+          final String ref = URL.decodeQueryString(dashboardId.substring(0, c));
+          final String path = URL.decodeQueryString(dashboardId.substring(c + 1));
           DashboardList.get(new Project.NameKey(project), ref + ":" + path, cb);
           return;
         }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardList.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardList.java
index f4da5faddf..2fb4c17314 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardList.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/dashboards/DashboardList.java
@@ -50,11 +50,11 @@ public class DashboardList extends NativeList<DashboardInfo> {
   private static String encodeDashboardId(String dashboardId) {
     int c = dashboardId.indexOf(":");
     if (0 <= c) {
-      final String ref = URL.encode(dashboardId.substring(0, c));
-      final String path = URL.encode(dashboardId.substring(c + 1));
+      final String ref = URL.encodeQueryString(dashboardId.substring(0, c));
+      final String path = URL.encodeQueryString(dashboardId.substring(c + 1));
       return ref + ":" + path;
     } else {
-      return URL.encode(dashboardId);
+      return URL.encodeQueryString(dashboardId);
     }
   }