diff --git a/demo-shell/resources/i18n/en.json b/demo-shell/resources/i18n/en.json
index 9589d50b36..490c03de41 100644
--- a/demo-shell/resources/i18n/en.json
+++ b/demo-shell/resources/i18n/en.json
@@ -168,6 +168,7 @@
         "NODE_LIST":"Tag list By Node ID"
     },
     "DEMO_PERMISSION": {
-      "INHERIT_PERMISSION_BUTTON" :"Inherit Permission"
+       "INHERIT_PERMISSION_BUTTON" :"Inherit Permission" ,
+       "INHERITED_PERMISSIONS_BUTTON" : "Permission Inherited"
     }
 }
diff --git a/demo-shell/src/app/components/permissions/demo-permissions.component.html b/demo-shell/src/app/components/permissions/demo-permissions.component.html
index ba83edab83..2adeb22178 100644
--- a/demo-shell/src/app/components/permissions/demo-permissions.component.html
+++ b/demo-shell/src/app/components/permissions/demo-permissions.component.html
@@ -1,8 +1,9 @@
 <div class="inherit_permission_button">
     <button mat-raised-button
-            color="primary"
+            [color]="toggleStatus?'accent':'primary'"
             adf-inherit-permission [nodeId]="nodeId"
-            (updated)="onUpdatedPermissions()">{{'DEMO_PERMISSION.INHERIT_PERMISSION_BUTTON' | translate}}</button>
+            (updated)="onUpdatedPermissions($event)">
+            {{ (toggleStatus?'DEMO_PERMISSION.INHERITED_PERMISSIONS_BUTTON':'DEMO_PERMISSION.INHERIT_PERMISSION_BUTTON') | translate}}</button>
 </div>
 <div>
 	<adf-permission-list #permissionList [nodeId]="nodeId">
diff --git a/demo-shell/src/app/components/permissions/demo-permissions.component.ts b/demo-shell/src/app/components/permissions/demo-permissions.component.ts
index 1efb3e6df8..cc4ad25a3e 100644
--- a/demo-shell/src/app/components/permissions/demo-permissions.component.ts
+++ b/demo-shell/src/app/components/permissions/demo-permissions.component.ts
@@ -18,6 +18,8 @@
 import { Component, Optional, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Params} from '@angular/router';
 import { PermissionListComponent } from '@alfresco/adf-content-services';
+import { MinimalNodeEntryEntity } from 'alfresco-js-api';
+import { NodesApiService } from '@alfresco/adf-core';
 
 @Component({
     selector: 'app-permissions',
@@ -30,8 +32,10 @@ export class DemoPermissionComponent implements OnInit {
     displayPermissionComponent: PermissionListComponent;
 
     nodeId: string;
+    toggleStatus = false;
 
-    constructor(@Optional() private route: ActivatedRoute) {
+    constructor(@Optional() private route: ActivatedRoute,
+                private nodeService: NodesApiService) {
     }
 
     ngOnInit() {
@@ -42,9 +46,13 @@ export class DemoPermissionComponent implements OnInit {
                 }
             });
         }
+        this.nodeService.getNode(this.nodeId, {include: ['permissions'] }).subscribe( (currentNode: MinimalNodeEntryEntity) => {
+            this.toggleStatus = currentNode.permissions.isInheritanceEnabled;
+        });
     }
 
-    onUpdatedPermissions() {
+    onUpdatedPermissions(node: MinimalNodeEntryEntity) {
+        this.toggleStatus = node.permissions.isInheritanceEnabled;
         this.displayPermissionComponent.reload();
     }
 
diff --git a/lib/content-services/permission-manager/components/inherited-button.directive.ts b/lib/content-services/permission-manager/components/inherited-button.directive.ts
index e0f219dbb7..01e5e21468 100644
--- a/lib/content-services/permission-manager/components/inherited-button.directive.ts
+++ b/lib/content-services/permission-manager/components/inherited-button.directive.ts
@@ -41,7 +41,7 @@ export class InheritPermissionDirective {
     onInheritPermissionClicked() {
         this.nodeService.getNode(this.nodeId).subscribe((node: MinimalNodeEntryEntity) => {
             const nodeBody = { permissions : {isInheritanceEnabled : !node.permissions.isInheritanceEnabled} };
-            this.nodeService.updateNode(this.nodeId, nodeBody).subscribe((nodeUpdated: MinimalNodeEntryEntity) => {
+            this.nodeService.updateNode(this.nodeId, nodeBody, {include: ['permissions'] }).subscribe((nodeUpdated: MinimalNodeEntryEntity) => {
                 this.updated.emit(nodeUpdated);
             });
         });