diff --git a/ui/src/app/dashboard/dashboard.routes.js b/ui/src/app/dashboard/dashboard.routes.js
index 2ddfd89dc2..e78d211b03 100644
--- a/ui/src/app/dashboard/dashboard.routes.js
+++ b/ui/src/app/dashboard/dashboard.routes.js
@@ -142,7 +142,29 @@ export default function DashboardRoutes($stateProvider) {
                 pageTitle: 'edge.dashboards'
             },
             ncyBreadcrumb: {
-                label: '{"icon": "dashboard", "label": "{{ vm.edgeDashboardsTitle }}", "translate": "false"}'
+                label: '{"icon": "dashboard", "label": "edge.dashboards"}'
+            }
+        })
+        .state('home.edges.dashboards.dashboard', {
+            url: '/:dashboardId?state',
+            reloadOnSearch: false,
+            module: 'private',
+            auth: ['TENANT_ADMIN', 'CUSTOMER_USER'],
+            views: {
+                "content@home": {
+                    templateUrl: dashboardTemplate,
+                    controller: 'DashboardController',
+                    controllerAs: 'vm'
+                }
+            },
+            data: {
+                widgetEditMode: false,
+                searchEnabled: false,
+                pageTitle: 'dashboard.dashboard',
+                dashboardsType: 'edge',
+            },
+            ncyBreadcrumb: {
+                label: '{"icon": "dashboard", "label": "{{ vm.dashboard.title }}", "translate": "false"}'
             }
         })
 }
diff --git a/ui/src/app/dashboard/dashboards.controller.js b/ui/src/app/dashboard/dashboards.controller.js
index 51eed98d4c..6d61029b84 100644
--- a/ui/src/app/dashboard/dashboards.controller.js
+++ b/ui/src/app/dashboard/dashboards.controller.js
@@ -674,6 +674,11 @@ export function DashboardsController(userService, dashboardService, customerServ
                 customerId: customerId,
                 dashboardId: dashboard.id.id
             });
+        } else if (vm.dashboardsScope === 'edge') {
+            $state.go('home.edges.dashboards.dashboard', {
+                edgeId: edgeId,
+                dashboardId: dashboard.id.id
+            });
         } else {
             $state.go('home.dashboards.dashboard', {dashboardId: dashboard.id.id});
         }