diff --git a/src/lib/inputs/input-with-action/input-with-action.component.html b/src/lib/inputs/input-with-action/input-with-action.component.html
index 8591c2b..2859049 100644
--- a/src/lib/inputs/input-with-action/input-with-action.component.html
+++ b/src/lib/inputs/input-with-action/input-with-action.component.html
@@ -1,8 +1,9 @@
-<div [style.max-width]="computedWidth" [style.width]="computedWidth" class="iqser-input-group">
+<form (submit)="executeAction(null)" [style.max-width]="computedWidth" [style.width]="computedWidth" class="iqser-input-group">
     <input
-        [(ngModel)]="value"
         (ngModelChange)="valueChange.emit($event)"
+        [(ngModel)]="value"
         [autocomplete]="autocomplete"
+        [ngModelOptions]="{ standalone: true }"
         [placeholder]="placeholder"
         class="with-icon mt-0"
         type="text"
@@ -19,7 +20,6 @@
         *ngIf="!isSearch"
         [disabled]="!hasContent"
         [icon]="icon"
-        [isSubmit]="true"
         [size]="25"
     ></iqser-circle-button>
-</div>
+</form>
diff --git a/src/lib/inputs/input-with-action/input-with-action.component.ts b/src/lib/inputs/input-with-action/input-with-action.component.ts
index 7bd26f3..3ebf3be 100644
--- a/src/lib/inputs/input-with-action/input-with-action.component.ts
+++ b/src/lib/inputs/input-with-action/input-with-action.component.ts
@@ -27,7 +27,7 @@ export class InputWithActionComponent {
     }
 
     get isSearch(): boolean {
-        return this.action.observers.length === 0;
+        return !this.icon;
     }
 
     reset(): void {
@@ -37,7 +37,7 @@ export class InputWithActionComponent {
     }
 
     executeAction($event: MouseEvent): void {
-        $event.stopPropagation();
+        $event?.stopPropagation();
 
         if (this.hasContent) {
             this.action.emit(this.value);