diff --git a/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.html b/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.html
index 131852b..f9bc164 100644
--- a/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.html
+++ b/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.html
@@ -10,14 +10,14 @@ <h4 class="modal-title">Create dependency</h4>
     <div class="form-group">
         <label>Source: </label>
         <div>
-            <jhi-microservice-search [initialValue]="source"
+            <jhi-microservice-search [initialValue]="source!"
                                      (itemSelected)="onSourceSelected($event)"></jhi-microservice-search>
         </div>
     </div>
     <div class="form-group">
         <label>Target: </label>
         <div>
-            <jhi-microservice-search [initialValue]="target"
+            <jhi-microservice-search [initialValue]="target!"
                                      (itemSelected)="onTargetSelected($event)"></jhi-microservice-search>
         </div>
     </div>
@@ -26,5 +26,6 @@ <h4 class="modal-title">Create dependency</h4>
                 (click)="createDependency()">Create
         </button>
         <button type="submit" class="btn btn-secondary" (click)="cancel()">Cancel</button>
+        <button type="submit" class="btn btn-warning float-right" (click)="swap()">Swap</button>
     </div>
 </div>
diff --git a/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.ts b/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.ts
index 0304aa5..8152c8a 100644
--- a/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.ts
+++ b/src/main/webapp/app/dashboard/dependency-dashboard/create-dependency-dialog/create-dependency-dialog.component.ts
@@ -67,4 +67,12 @@ export class CreateDependencyDialogComponent implements OnInit {
   updateName(): void {
     this.name = `${this.source?.name} -> ${this.target?.name}`;
   }
+
+  swap(): void {
+    const tmp = this.target;
+    this.target = this.source;
+    this.source = tmp;
+
+    this.updateName();
+  }
 }
diff --git a/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-search/microservice-search.component.ts b/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-search/microservice-search.component.ts
index b1f662b..7b39f55 100644
--- a/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-search/microservice-search.component.ts
+++ b/src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-search/microservice-search.component.ts
@@ -17,16 +17,16 @@ export class MicroserviceSearchComponent implements OnInit {
    * Enables advanced search capabilities. Default: false
    */
   @Input() advanced = false;
-  @Input() initialValue?: IMicroservice;
   @Output() itemSelected = new EventEmitter<IMicroservice>();
   @Output() groupFilterChanged = new EventEmitter<IMicroserviceGroupFilter>();
 
   constructor(protected microserviceService: MicroserviceService) {}
 
-  ngOnInit(): void {
-    if (this.initialValue) {
-      this.model = this.initialValue;
-    }
+  ngOnInit(): void {}
+
+  @Input()
+  set initialValue(value: IMicroservice) {
+    this.model = value;
   }
 
   search = (text$: Observable<string>) =>