diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/add-rule-node-dialog.component.html b/ui-ngx/src/app/modules/home/pages/rulechain/add-rule-node-dialog.component.html
index 999ac5c199..e8df333ecd 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/add-rule-node-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/add-rule-node-dialog.component.html
@@ -34,6 +34,7 @@
         [ruleNode]="ruleNode"
         [ruleChainId]="ruleChainId"
         [isEdit]="true"
+        [isAdd]="true"
         [isReadOnly]="false">
       </tb-rule-node>
     </fieldset>
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
index d6936ec932..e87f7158d0 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
@@ -15,6 +15,12 @@
     limitations under the License.
 
 -->
+<div class="tb-details-buttons" *ngIf="!isAdd && ruleNode.component.type === ruleNodeType.RULE_CHAIN">
+  <button mat-raised-button color="primary"
+          (click)="openRuleChain($event)">
+    {{'rulechain.open-rulechain' | translate }}
+  </button>
+</div>
 <div class="mat-padding" fxLayout="column">
   <form [formGroup]="ruleNodeFormGroup">
     <fieldset [disabled]="(isLoading$ | async) || !isEdit || isReadOnly">
@@ -44,14 +50,6 @@
         </div>
       </section>
       <section *ngIf="ruleNode.component.type === ruleNodeType.RULE_CHAIN">
-        <div class="tb-details-buttons" fxLayout.xs="column">
-          <button mat-raised-button color="primary"
-                  [disabled]="(isLoading$ | async)"
-                  (click)="onEntityAction($event, 'disableAccount')"
-                  [fxShow]="!isEdit && isUserCredentialsEnabled()">
-            {{'user.disable-account' | translate }}
-          </button>
-        </div>
         <tb-entity-autocomplete required
                                 [excludeEntityIds]="[ruleChainId]"
                                 [entityType]="entityType.RULE_CHAIN"
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.ts
index 29312725b5..c19fe98348 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.ts
@@ -24,6 +24,7 @@ import { EntityType } from '@shared/models/entity-type.models';
 import { Subscription } from 'rxjs';
 import { RuleChainService } from '@core/http/rule-chain.service';
 import { RuleNodeConfigComponent } from './rule-node-config.component';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'tb-rule-node',
@@ -46,6 +47,9 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
   @Input()
   isReadOnly: boolean;
 
+  @Input()
+  isAdd = false;
+
   ruleNodeType = RuleNodeType;
   entityType = EntityType;
 
@@ -55,7 +59,8 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
 
   constructor(protected store: Store<AppState>,
               private fb: FormBuilder,
-              private ruleChainService: RuleChainService) {
+              private ruleChainService: RuleChainService,
+              private router: Router) {
     super(store);
     this.ruleNodeFormGroup = this.fb.group({});
   }
@@ -133,4 +138,13 @@ export class RuleNodeDetailsComponent extends PageComponent implements OnInit, O
       this.ruleNodeConfigComponent.validate();
     }
   }
+
+  openRuleChain($event: Event) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    if (this.ruleNode.targetRuleChainId) {
+      this.router.navigateByUrl(`/ruleChains/${this.ruleNode.targetRuleChainId}`);
+    }
+  }
 }
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
index 6a558edc11..2c8ecc9419 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-page.component.ts
@@ -321,6 +321,8 @@ export class RuleChainPageComponent extends PageComponent
     if (this.ruleChainCanvas) {
       this.ruleChainCanvas.adjustCanvasSize(true);
     }
+    this.isEditingRuleNode = false;
+    this.isEditingRuleNodeLink = false;
     this.updateRuleNodesHighlight();
   }
 
@@ -1423,6 +1425,7 @@ export class RuleChainPageComponent extends PageComponent
             scroll: true
           },
           side: 'right',
+          distance: 12,
           trackOrigin: true
         }
       );