diff --git a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
index 6906bf761..ce7de9aaf 100644
--- a/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
+++ b/src/addons/mod/glossary/components/index/addon-mod-glossary-index.html
@@ -98,7 +98,8 @@
             </ng-container>
         </ion-list>
 
-        <core-empty-box *ngIf="entries.empty" icon="fas-list" [message]="'addon.mod_glossary.noentriesfound' | translate">
+        <core-empty-box *ngIf="entries.empty && (!isSearch || hasSearched)" icon="fas-list"
+            [message]="'addon.mod_glossary.noentriesfound' | translate">
         </core-empty-box>
 
         <core-infinite-loading [enabled]="!entries.completed" [error]="loadMoreError" (action)="loadMoreEntries($event)">
diff --git a/src/addons/mod/glossary/components/index/index.ts b/src/addons/mod/glossary/components/index/index.ts
index d79b755ea..fac7c7507 100644
--- a/src/addons/mod/glossary/components/index/index.ts
+++ b/src/addons/mod/glossary/components/index/index.ts
@@ -64,6 +64,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     moduleName = 'glossary';
 
     isSearch = false;
+    hasSearched = false;
     canAdd = false;
     loadMoreError = false;
     loadingMessage?: string;
@@ -429,6 +430,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
     toggleSearch(): void {
         if (this.isSearch) {
             this.isSearch = false;
+            this.hasSearched = false;
             this.entries.setOnlineEntries(this.fetchedEntries, this.fetchedEntriesCanLoadMore);
             this.switchMode(this.fetchMode!);
         } else {
@@ -488,6 +490,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
             'ASC',
         );
         this.loaded = false;
+        this.hasSearched = true;
         this.loadContent();
     }