diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
index 2b2243e53..bc740bf1a 100644
--- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
@@ -12,7 +12,7 @@
 		</mat-form-field>
 		<!-- End of Sort by -->
 		<!-- Search Filter-->
-		<mat-form-field appearance="outline" class="search-form ml-auto col-auto pr-0" floatLabel="never">
+		<mat-form-field *ngIf="datasetDrafts && datasetDrafts.length > 0"  appearance="outline" class="search-form ml-auto col-auto pr-0" floatLabel="never">
 			<mat-icon matSuffix>search</mat-icon>
 			<input matInput placeholder="{{'CRITERIA.DATA-SETS.DRAFT-LIKE'| translate}}" name="likeCriteria" [formControl]="formGroup.get('like')">
 			<mat-error *ngIf="formGroup.get('like').hasError('backendError')">{{formGroup.get('like').getError('backendError').message}}</mat-error>
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
index e3a8f43b3..585a13c31 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
@@ -16,7 +16,7 @@
 		</mat-form-field>
 		<!-- End of Sort by -->
 		<!-- Search Filter-->
-		<mat-form-field appearance="outline" class="search-form ml-auto col-auto" floatLabel="never">
+		<mat-form-field *ngIf="allRecentActivities && allRecentActivities.length > 0" appearance="outline" class="search-form ml-auto col-auto" floatLabel="never">
 			<mat-icon matSuffix>search</mat-icon>
 			<input matInput placeholder="{{'CRITERIA.LIKE'| translate}}" name="likeCriteria" [formControl]="formGroup.get('like')">
 			<mat-error *ngIf="formGroup.get('like').hasError('backendError')">{{formGroup.get('like').getError('backendError').message}}</mat-error>
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
index af14cb7f5..a8558e75d 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
@@ -13,7 +13,7 @@
 		</mat-form-field>
 		<!-- End of Sort by -->
 		<!-- Search Filter-->
-		<mat-form-field appearance="outline" class="search-form ml-auto col-auto pr-0" floatLabel="never">
+		<mat-form-field *ngIf="datasetActivities && datasetActivities.length > 0" appearance="outline" class="search-form ml-auto col-auto pr-0" floatLabel="never">
 			<mat-icon matSuffix>search</mat-icon>
 			<input matInput placeholder="{{'CRITERIA.DATA-SETS.LIKE'| translate}}" name="likeCriteria" [formControl]="formGroup.get('like')">
 			<mat-error *ngIf="formGroup.get('like').hasError('backendError')">{{formGroup.get('like').getError('backendError').message}}</mat-error>
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html
index 1ca40c7fe..c7a747e56 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html
@@ -13,7 +13,7 @@
 		</mat-form-field>
 		<!-- End of Sort by -->
 		<!-- Search Filter-->
-		<mat-form-field appearance="outline" class="search-form ml-auto col-auto pr-0" floatLabel="never">
+		<mat-form-field *ngIf="dmpActivities && dmpActivities.length > 0"  appearance="outline" class="search-form ml-auto col-auto pr-0" floatLabel="never">
 			<mat-icon matSuffix>search</mat-icon>
 			<input matInput placeholder="{{'CRITERIA.DMP.LIKE'| translate}}" name="likeCriteria" [formControl]="formGroup.get('like')">
 			<mat-error *ngIf="formGroup.get('like').hasError('backendError')">{{formGroup.get('like').getError('backendError').message}}</mat-error>
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
index 95648d57c..9aa45e5fc 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
@@ -42,7 +42,7 @@
 							</div>
 							<!-- End of Guided Tour -->
 							<!-- Search Filter-->
-							<mat-form-field appearance="outline" class="search-form ml-auto col-auto" floatLabel="never">
+							<mat-form-field *ngIf="listingItems && listingItems.length > 0" appearance="outline" class="search-form ml-auto col-auto" floatLabel="never">
 								<mat-icon matSuffix>search</mat-icon>
 								<input matInput placeholder="{{'CRITERIA.DATA-SETS.LIKE'| translate}}" name="likeCriteria" [formControl]="formGroup.get('like')">
 								<mat-error *ngIf="formGroup.get('like').hasError('backendError')">{{formGroup.get('like').getError('backendError').message}}</mat-error>
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
index f1412282b..d9097cae4 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
@@ -38,7 +38,7 @@
 							</div>
 							<!-- End of Guided Tour -->
 							<!-- Search Filter-->
-							<mat-form-field appearance="outline" class="search-form ml-auto col-auto pr-0"
+							<mat-form-field *ngIf="listingItems && listingItems.length > 0" appearance="outline" class="search-form ml-auto col-auto pr-0"
 								floatLabel="never">
 								<mat-icon matSuffix>search</mat-icon>
 								<input matInput placeholder="{{'CRITERIA.DMP.LIKE'| translate}}" name="likeCriteria"