diff --git a/projects/grid-failure-information-app/src/app/pages/distribution-group/distribution-group-members/distribution-group-members.component.html b/projects/grid-failure-information-app/src/app/pages/distribution-group/distribution-group-members/distribution-group-members.component.html
index 923c949..31255d5 100644
--- a/projects/grid-failure-information-app/src/app/pages/distribution-group/distribution-group-members/distribution-group-members.component.html
+++ b/projects/grid-failure-information-app/src/app/pages/distribution-group/distribution-group-members/distribution-group-members.component.html
@@ -29,7 +29,7 @@
       [inputFormatter]="sandbox.formatter"
       (selectItem)="sandbox.setSelectedContact($event.item)"
     />
-    <button type="button" class="btn btn-primary btn-sm" (click)="sandbox.assignContactToGroup(); clearSearchInput()">
+    <button type="button" class="btn btn-primary btn-sm" (click)="isContactSelected() && sandbox.assignContactToGroup(); clearSearchInput()">
       {{ 'DistributionGroupMember.AssignToGroupBtn' | translate }}
     </button>
     <button type="button" class="btn btn-primary btn-sm btn-sm" (click)="sandbox.cancelMembersDisplay()">
diff --git a/projects/grid-failure-information-app/src/app/pages/distribution-group/distribution-group-members/distribution-group-members.component.ts b/projects/grid-failure-information-app/src/app/pages/distribution-group/distribution-group-members/distribution-group-members.component.ts
index e18d537..db69c75 100644
--- a/projects/grid-failure-information-app/src/app/pages/distribution-group/distribution-group-members/distribution-group-members.component.ts
+++ b/projects/grid-failure-information-app/src/app/pages/distribution-group/distribution-group-members/distribution-group-members.component.ts
@@ -49,6 +49,10 @@
     this.searchInput.nativeElement.value = '';
   }
 
+  protected isContactSelected(): boolean {
+    return this.searchInput.nativeElement.value && this.searchInput.nativeElement.value.trim().length > 0;
+  }
+
   ngOnDestroy(): void {
     this._subscription.unsubscribe();
   }