diff --git a/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.html b/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.html
index 71aeb9956c..a1eaf9f748 100644
--- a/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.html
+++ b/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.html
@@ -29,7 +29,19 @@
         class="adf-permission-result-list"
         *ngIf="searchedWord.length !== 0">
 <ng-template let-data>
-    <mat-selection-list [class.adf-permission-result-list-elements]="data?.list?.entries.length !== 0">
+    <mat-selection-list class="adf-permission-result-list-elements">
+        <mat-list-option
+            id="adf-add-permission-group-everyone"
+            class="adf-list-option-item"
+            (click)="elementClicked(EVERYONE)">
+            <mat-icon mat-list-icon id="add-group-icon">
+                group_add
+            </mat-icon>
+            <p>
+                {{'PERMISSION_MANAGER.ADD-PERMISSION.EVERYONE' | translate}}
+            </p>
+        </mat-list-option>
+
         <mat-list-option *ngFor="let item of data?.list?.entries; let idx = index"
                             (click)="elementClicked(item)"
                             class="adf-list-option-item"
@@ -46,20 +58,6 @@
                                     item.entry?.properties['cm:authorityName'] :
                                     item.entry?.properties['cm:firstName']}}</p>
         </mat-list-option>
-        <mat-list-option *ngIf="data?.list?.entries.length !== 0"
-                    id="adf-add-permission-group-everyone"
-                    class="adf-list-option-item"
-                    (click)="elementClicked(EVERYONE)">
-            <mat-icon mat-list-icon id="add-group-icon">
-                group_add
-            </mat-icon>
-            <p>
-                {{'PERMISSION_MANAGER.ADD-PERMISSION.EVERYONE' | translate}}
-            </p>
-        </mat-list-option>
     </mat-selection-list>
-    <div *ngIf="data?.list?.entries.length === 0" class="adf-permission-no-result" id="adf-add-permission-no-results">
-        <span>{{'PERMISSION_MANAGER.ADD-PERMISSION.NO-RESULT' | translate}}</span>
-    </div>
 </ng-template>
 </adf-search>
diff --git a/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts b/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
index c5a1870d4b..638f9b0479 100644
--- a/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
+++ b/lib/content-services/permission-manager/components/add-permission/add-permission-panel.component.spec.ts
@@ -172,4 +172,19 @@ describe('AddPermissionPanelComponent', () => {
         });
     }));
 
+    it('should show everyone group when search return no result', async(() => {
+        searchApiService = fixture.componentRef.injector.get(SearchService);
+        spyOn(searchApiService, 'search').and.returnValue(Observable.of({ list: { entries: [] } }));
+        component.selectedItems.push(fakeAuthorityListResult.list.entries[0]);
+
+        typeWordIntoSearchInput('a');
+        fixture.detectChanges();
+        fixture.whenStable().then(() => {
+            fixture.detectChanges();
+            expect(element.querySelector('#adf-add-permission-authority-results')).not.toBeNull();
+            expect(element.querySelector('#adf-add-permission-group-everyone')).toBeDefined();
+            expect(element.querySelector('#adf-add-permission-group-everyone')).not.toBeNull();
+        });
+    }));
+
 });