diff --git a/src/app/components/search-input/search-input.component.ts b/src/app/components/search-input/search-input.component.ts
index ad8455fcc..2285cf376 100644
--- a/src/app/components/search-input/search-input.component.ts
+++ b/src/app/components/search-input/search-input.component.ts
@@ -112,7 +112,9 @@ export class SearchInputComponent implements OnInit {
      */
     onSearchSubmit(event: KeyboardEvent) {
         const searchTerm = (event.target as HTMLInputElement).value;
-        this.store.dispatch(new SearchByTermAction(searchTerm));
+        if (searchTerm) {
+            this.store.dispatch(new SearchByTermAction(searchTerm));
+        }
     }
 
     onSearchChange(searchTerm: string) {
@@ -130,7 +132,9 @@ export class SearchInputComponent implements OnInit {
             }
 
             this.navigationTimer = setTimeout(() => {
-                this.store.dispatch(new SearchByTermAction(searchTerm));
+                if (searchTerm) {
+                    this.store.dispatch(new SearchByTermAction(searchTerm));
+                }
                 this.hasOneChange = false;
             }, 1000);
         }
diff --git a/src/app/components/search/search.component.html b/src/app/components/search/search.component.html
index dca4e21e7..e6a189838 100644
--- a/src/app/components/search/search.component.html
+++ b/src/app/components/search/search.component.html
@@ -66,7 +66,9 @@
     <div class="inner-layout__content">
         <div class="inner-layout__panel">
             <div class="adf-search-results">
-                <adf-search-filter #searchFilter></adf-search-filter>
+                <adf-search-filter
+                    #searchFilter
+                    [ngClass]="{ 'adf-search-filter--hidden': !data?.list.entries.length }"></adf-search-filter>
 
                 <div class="adf-search-results__content">
                     <div class="adf-search-results__content-header content" *ngIf="data?.list.entries.length">
diff --git a/src/app/components/search/search.component.scss b/src/app/components/search/search.component.scss
index 2ba9bb18c..6a201a3b1 100644
--- a/src/app/components/search/search.component.scss
+++ b/src/app/components/search/search.component.scss
@@ -34,6 +34,10 @@
         padding: 5px;
         height: 100%;
         overflow: scroll;
+
+        &--hidden {
+            display: none;
+        }
     }
 
     .text--bold {
diff --git a/src/app/components/search/search.component.ts b/src/app/components/search/search.component.ts
index c438a2454..895885ff9 100644
--- a/src/app/components/search/search.component.ts
+++ b/src/app/components/search/search.component.ts
@@ -87,7 +87,8 @@ export class SearchComponent extends PageComponent implements OnInit {
                     this.queryBuilder.userQuery = query;
                     this.queryBuilder.update();
                 } else {
-                    this.onSearchResultLoaded( {list: { pagination: { totalItems: 0 }, entries: []}} );
+                    this.queryBuilder.userQuery = null;
+                    this.queryBuilder.executed.next( {list: { pagination: { totalItems: 0 }, entries: []}} );
                 }
             });
         }