diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index e2640885..6fad9e1d 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -120,6 +120,7 @@ import { ExportConfigActionComponent } from './components/project-map/context-me
 import { HttpConsoleNewTabActionComponent } from './components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component';
 import { HttpConsoleActionComponent } from './components/project-map/context-menu/actions/http-console/http-console-action.component';
 import { IdlePcActionComponent } from "./components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component";
+import { AutoIdlePcActionComponent } from "./components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component";
 import { ImportConfigActionComponent } from './components/project-map/context-menu/actions/import-config/import-config-action.component';
 import { LockActionComponent } from './components/project-map/context-menu/actions/lock-action/lock-action.component';
 import { MoveLayerDownActionComponent } from './components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component';
@@ -505,6 +506,7 @@ import { DeleteResourceConfirmationDialogComponent } from './components/resource
         OpenFileExplorerActionComponent,
         HttpConsoleActionComponent,
         IdlePcActionComponent,
+        AutoIdlePcActionComponent,
         WebConsoleComponent,
         ConsoleWrapperComponent,
         HttpConsoleNewTabActionComponent,
diff --git a/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.html b/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.html
new file mode 100644
index 00000000..8e5e2dcf
--- /dev/null
+++ b/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.html
@@ -0,0 +1,9 @@
+<button
+  mat-menu-item
+  *ngIf="node.node_type === 'dynamips'"
+  (click)="autoIdlePC()"
+>
+  <mat-icon>query_builder</mat-icon>
+  <span>Auto Idle-PC</span>
+</button>
+
diff --git a/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.ts b/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.ts
new file mode 100644
index 00000000..e32c7a1b
--- /dev/null
+++ b/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.ts
@@ -0,0 +1,36 @@
+import { Component, Input } from '@angular/core';
+import { Node } from '../../../../../cartography/models/node';
+import { Controller } from '../../../../../models/controller';
+import { NodeService } from "@services/node.service";
+import { ToasterService } from "@services/toaster.service";
+import { ProgressService } from "../../../../../common/progress/progress.service";
+
+@Component({
+  selector: 'app-auto-idle-pc-action',
+  templateUrl: './auto-idle-pc-action.component.html',
+})
+export class AutoIdlePcActionComponent {
+  @Input() controller:Controller ;
+  @Input() node: Node;
+
+  constructor(
+    private nodeService: NodeService,
+    private toasterService: ToasterService,
+    private progressService: ProgressService,
+  ) {}
+
+  autoIdlePC() {
+    this.progressService.activate();
+    this.nodeService.getAutoIdlePC(this.controller, this.node).subscribe((result: any) => {
+      this.progressService.deactivate();
+      if (result.idlepc !== null) {
+        this.toasterService.success(`Node ${this.node.name} updated with idle-PC value ${result.idlepc}`);
+      }
+    },
+      (error) => {
+        this.progressService.deactivate();
+        this.toasterService.error(`Error while updating idle-PC value for node ${this.node.name}`);
+      }
+    );
+  }
+}
diff --git a/src/app/components/project-map/context-menu/context-menu.component.html b/src/app/components/project-map/context-menu/context-menu.component.html
index f26dfd80..cd3bcedc 100644
--- a/src/app/components/project-map/context-menu/context-menu.component.html
+++ b/src/app/components/project-map/context-menu/context-menu.component.html
@@ -99,6 +99,11 @@
       [controller]="controller"
       [node]="nodes[0]"
     ></app-idle-pc-action>
+    <app-auto-idle-pc-action
+      *ngIf="nodes.length === 1 && nodes[0].node_type === 'dynamips'"
+      [controller]="controller"
+      [node]="nodes[0]"
+    ></app-auto-idle-pc-action>
     <app-move-layer-up-action
       *ngIf="!projectService.isReadOnly(project) && (drawings.length || nodes.length)"
       [controller]="controller"
diff --git a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.html b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.html
index 53e4a69c..1e938a2a 100644
--- a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.html
+++ b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.html
@@ -11,6 +11,8 @@
       placeholder="Idle-PC"
       [ngModelOptions]="{standalone: true}"
       [(ngModel)]="idlePC"
+      [matTooltip]="getTooltip()"
+      matTooltipClass="multiline-tooltip"
     >
       <mat-option *ngFor="let idlepc of idlepcs" [value]="idlepc.key"> {{ idlepc.name }} </mat-option>
     </mat-select>
diff --git a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.scss b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.scss
index add91a3f..71573ef6 100644
--- a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.scss
+++ b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.scss
@@ -3,3 +3,9 @@
   display: flex;
   justify-content: space-between;
 }
+
+.multiline-tooltip {
+  background-color: grey;
+  color: #ffffff;
+  white-space: pre-line;
+}
diff --git a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.ts b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.ts
index c6b64968..6ad045bc 100644
--- a/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.ts
+++ b/src/app/components/project-map/context-menu/dialogs/idle-pc-dialog/idle-pc-dialog.component.ts
@@ -1,5 +1,5 @@
-import {ChangeDetectorRef, Component, Inject, Input, OnInit} from '@angular/core';
-import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {Component, Input, OnInit, ViewEncapsulation} from '@angular/core';
+import {MatDialogRef} from '@angular/material/dialog';
 import {Controller} from "@models/controller";
 import {Node} from '../../../../../cartography/models/node';
 import {NodeService} from "@services/node.service";
@@ -9,6 +9,7 @@ import {ToasterService} from "@services/toaster.service";
   selector: 'app-idle-pc-dialog',
   templateUrl: './idle-pc-dialog.component.html',
   styleUrls: ['./idle-pc-dialog.component.scss'],
+  encapsulation: ViewEncapsulation.None
 })
 export class IdlePCDialogComponent implements OnInit {
   @Input() controller: Controller;
@@ -21,12 +22,17 @@ export class IdlePCDialogComponent implements OnInit {
   constructor(
     private nodeService: NodeService,
     public dialogRef: MatDialogRef<IdlePCDialogComponent>,
-    private toasterService: ToasterService) {}
+    private toasterService: ToasterService
+  ) {}
 
   ngOnInit() {
     this.onCompute();
   }
 
+  getTooltip(){
+    return "Best Idle-PC values are obtained when IOS is in idle state, after the 'Press RETURN to get started' message has appeared on the console, messages have finished displaying on the console and you have have actually pressed the RETURN key.\n\nFinding the right idle-pc value is a trial and error process, consisting of applying different Idle-PC values and monitoring the CPU usage.\n\nSelect each value that appears in the list and click Apply, and note the CPU usage a few moments later. When you have found the value that minimises the CPU usage, apply that value.";
+  }
+
   onCompute() {
     this.isComputing = true;
     this.nodeService.getIdlePCProposals(this.controller, this.node).subscribe((idlepcs: any) => {