diff --git a/frontend/src/app/data-management/alert-management/alert-view/alert-view.component.html b/frontend/src/app/data-management/alert-management/alert-view/alert-view.component.html
index 89e9041a5..e0c6fb69f 100644
--- a/frontend/src/app/data-management/alert-management/alert-view/alert-view.component.html
+++ b/frontend/src/app/data-management/alert-management/alert-view/alert-view.component.html
@@ -196,6 +196,7 @@ <h5 class="card-title mb-0 text-uppercase label-header">
                                container="body"
                                placement="top"
                                tooltipClass="utm-tooltip-top"></i>
+
                             <app-alert-apply-incident (markAsIncident)="onSuccessMarkAsIncident($event)"
                                                       *ngIf="dataType !== eventDataTypeEnum.INCIDENT"
                                                       [alert]="alert"
@@ -203,7 +204,7 @@ <h5 class="card-title mb-0 text-uppercase label-header">
                                                       [multiple]="false">
                             </app-alert-apply-incident>
                             <i (click)="openIncidentResponseAutomationModal(alert)"
-                               [ngbTooltip]="'Create incident response automation'"
+                               [ngbTooltip]="'Create Flow'"
                                class="cursor-pointer icon-terminal text-blue-800"
                                container="body"
                                placement="top"
diff --git a/frontend/src/app/data-management/alert-management/alert-view/alert-view.component.ts b/frontend/src/app/data-management/alert-management/alert-view/alert-view.component.ts
index 5dcc3039c..116ffe7c5 100644
--- a/frontend/src/app/data-management/alert-management/alert-view/alert-view.component.ts
+++ b/frontend/src/app/data-management/alert-management/alert-view/alert-view.component.ts
@@ -554,8 +554,9 @@ export class AlertViewComponent implements OnInit, OnDestroy {
   }
 
   openIncidentResponseAutomationModal(alert: UtmAlertType) {
-    const modal = this.modalService.open(IrCreateRuleComponent, {size: 'lg', centered: true});
-    modal.componentInstance.alert = alert;
+       this.router.navigate(['soar/create-flow'], {
+            queryParams:{alertName:alert.name}
+          })
   }
 
   getFilterTime() {
diff --git a/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-incident/alert-apply-incident.component.ts b/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-incident/alert-apply-incident.component.ts
index ce96d1d52..044d03163 100644
--- a/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-incident/alert-apply-incident.component.ts
+++ b/frontend/src/app/data-management/alert-management/shared/components/alert-actions/alert-apply-incident/alert-apply-incident.component.ts
@@ -9,7 +9,6 @@ import {UtmAlertType} from '../../../../../../shared/types/alert/utm-alert.type'
 import {AlertUpdateHistoryBehavior} from '../../../behavior/alert-update-history.behavior';
 import {EventDataTypeEnum} from '../../../enums/event-data-type.enum';
 import {AlertManagementService} from '../../../services/alert-management.service';
-
 @Component({
   selector: 'app-alert-apply-incident',
   templateUrl: './alert-apply-incident.component.html',
diff --git a/frontend/src/app/incident-response/playbook-builder/playbook-builder.component.ts b/frontend/src/app/incident-response/playbook-builder/playbook-builder.component.ts
index b23ec1f91..d20ec31e9 100644
--- a/frontend/src/app/incident-response/playbook-builder/playbook-builder.component.ts
+++ b/frontend/src/app/incident-response/playbook-builder/playbook-builder.component.ts
@@ -119,11 +119,25 @@ export class PlaybookBuilderComponent implements OnInit, OnDestroy {
         this.utmToastService.showError('Error', 'An error has occurred while fetching a rule');
       });
 
+    this.route.queryParams
+      .pipe(
+        filter(params => !!params && !!params.alertName),
+        map(params => params.alertName)).subscribe((alertName)=>{
+        this.addRuleCondition();
+        const rc = this.ruleConditions.at(this.ruleConditions.length-1);
+        rc.patchValue({
+          field: 'name',
+          value: alertName,
+        });
+      });
+
     this.formRule.get('name').valueChanges.pipe(debounceTime(1000)).subscribe(value => {
       this.searchRule(this.rulePrefix + value);
     });
   }
 
+
+
   get ruleConditions() {
     return this.formRule.get('conditions') as FormArray;
   }