diff --git a/ui/src/app/dashboard/dashboard-fieldset.tpl.html b/ui/src/app/dashboard/dashboard-fieldset.tpl.html
index bf3283b857..d3eb314917 100644
--- a/ui/src/app/dashboard/dashboard-fieldset.tpl.html
+++ b/ui/src/app/dashboard/dashboard-fieldset.tpl.html
@@ -16,7 +16,7 @@
 
 -->
 <md-button ng-click="onExportDashboard({event: $event})"
-		   ng-show="!isEdit && dashboardScope === 'tenant'"
+		   ng-show="!isEdit && (dashboardScope === 'tenant' || dashboardScope === 'edge')"
 		   class="md-raised md-primary">{{ 'dashboard.export' | translate }}</md-button>
 <md-button ng-click="onMakePublic({event: $event})"
 		   ng-show="!isEdit && dashboardScope === 'tenant' && !dashboard.publicCustomerId"
@@ -34,6 +34,9 @@
 <md-button ng-click="onDeleteDashboard({event: $event})"
 		   ng-show="!isEdit && dashboardScope === 'tenant'"
 		   class="md-raised md-primary">{{ 'dashboard.delete' | translate }}</md-button>
+<md-button ng-click="onUnassignFromEdge({event: $event})"
+           ng-show="!isEdit && dashboardScope === 'edge'"
+           class="md-raised md-primary">{{ 'edge.unassign-from-edge' | translate }}</md-button>
 <md-content class="md-padding" layout="column">
 	<md-input-container class="md-block"
 						ng-show="!isEdit && dashboard.assignedCustomersText && dashboardScope === 'tenant'">
diff --git a/ui/src/app/dashboard/dashboard.directive.js b/ui/src/app/dashboard/dashboard.directive.js
index 37e3485d31..2d5b942410 100644
--- a/ui/src/app/dashboard/dashboard.directive.js
+++ b/ui/src/app/dashboard/dashboard.directive.js
@@ -48,12 +48,14 @@ export default function DashboardDirective($compile, $templateCache, $translate,
             dashboard: '=',
             isEdit: '=',
             customerId: '=',
+            edgeId: '=',
             dashboardScope: '=',
             theForm: '=',
             onMakePublic: '&',
             onMakePrivate: '&',
             onManageAssignedCustomers: '&',
             onUnassignFromCustomer: '&',
+            onUnassignFromEdge: '&',
             onExportDashboard: '&',
             onDeleteDashboard: '&'
         }
diff --git a/ui/src/app/dashboard/dashboards.controller.js b/ui/src/app/dashboard/dashboards.controller.js
index 964f440afe..f5fc50d538 100644
--- a/ui/src/app/dashboard/dashboards.controller.js
+++ b/ui/src/app/dashboard/dashboards.controller.js
@@ -129,6 +129,7 @@ export function DashboardsController(userService, dashboardService, customerServ
     vm.manageAssignedCustomers = manageAssignedCustomers;
     vm.unassignFromCustomer = unassignFromCustomer;
     vm.exportDashboard = exportDashboard;
+    vm.unassignFromEdge = unassignFromEdge;
 
     initController();
 
@@ -156,6 +157,10 @@ export function DashboardsController(userService, dashboardService, customerServ
             );
         }
 
+        if (edgeId) {
+            vm.edgeId = edgeId;
+        }
+
         if (vm.dashboardsScope === 'tenant') {
             fetchDashboardsFunction = function (pageLink) {
                 return dashboardService.getTenantDashboards(pageLink);
diff --git a/ui/src/app/dashboard/dashboards.tpl.html b/ui/src/app/dashboard/dashboards.tpl.html
index 2fb4e35e72..02f6ef8101 100644
--- a/ui/src/app/dashboard/dashboards.tpl.html
+++ b/ui/src/app/dashboard/dashboards.tpl.html
@@ -26,12 +26,14 @@
 								  is-edit="vm.grid.detailsConfig.isDetailsEditMode"
 								  dashboard-scope="vm.dashboardsScope"
 								  customer-id="vm.customerId"
+                                  edge-id="vm.edgeId"
 								  the-form="vm.grid.detailsForm"
 								  on-make-public="vm.makePublic(event, vm.grid.detailsConfig.currentItem)"
 								  on-make-private="vm.makePrivate(event, vm.grid.detailsConfig.currentItem)"
 								  on-manage-assigned-customers="vm.manageAssignedCustomers(event, vm.grid.detailsConfig.currentItem)"
 								  on-unassign-from-customer="vm.unassignFromCustomer(event, vm.grid.detailsConfig.currentItem, vm.customerId)"
-								  on-export-dashboard="vm.exportDashboard(event, vm.grid.detailsConfig.currentItem)"
+                                  on-unassign-from-edge="vm.unassignFromEdge(event, vm.grid.detailsConfig.currentItem, vm.edgeId)"
+                                  on-export-dashboard="vm.exportDashboard(event, vm.grid.detailsConfig.currentItem)"
 								  on-delete-dashboard="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-dashboard-details>
 		</md-tab>
 		<md-tab ng-if="!vm.grid.detailsConfig.isDetailsEditMode && vm.grid.isTenantAdmin()" md-on-select="vm.grid.triggerResize()" label="{{ 'audit-log.audit-logs' | translate }}">