3 files changed, 10 insertions, 5 deletions

diff --git a/client/src/app/+my-library/my-history/my-history.component.html b/client/src/app/+my-library/my-history/my-history.component.html
index 76367c029..6791dab52 100644
--- a/client/src/app/+my-library/my-history/my-history.component.html
+++ b/client/src/app/+my-library/my-history/my-history.component.html
@@ -27,7 +27,7 @@
   [titlePage]="titlePage"
   [getVideosObservableFunction]="getVideosObservableFunction"
   [user]="user"
-  i18n-noResultMessage noResultMessage="You don't have any video in your watch history yet."
+  [noResultMessage]="getNoResultMessage()"
   [enableSelection]="false"
   [disabled]="disabled"
   #videosSelection
diff --git a/client/src/app/+my-library/my-history/my-history.component.scss b/client/src/app/+my-library/my-history/my-history.component.scss
index 3257b2215..21011a089 100644
--- a/client/src/app/+my-library/my-history/my-history.component.scss
+++ b/client/src/app/+my-library/my-history/my-history.component.scss
@@ -6,7 +6,6 @@
   justify-content: center;
   margin-top: 50px;
   font-weight: $font-semibold;
-  font-size: 16px;
 }
 
 .top-buttons {
@@ -29,11 +28,11 @@
 
     grid-column: 3;
     display: flex;
+    align-items: center;
 
     label {
       margin: 0 0 0 5px;
       color: var(--greyForegroundColor);
-      font-size: 15px;
       font-weight: $font-semibold;
     }
   }
@@ -44,8 +43,6 @@
     @include button-with-icon;
 
     grid-column: 4;
-
-    font-size: 15px;
   }
 }
 
diff --git a/client/src/app/+my-library/my-history/my-history.component.ts b/client/src/app/+my-library/my-history/my-history.component.ts
index 766869637..c4878c957 100644
--- a/client/src/app/+my-library/my-history/my-history.component.ts
+++ b/client/src/app/+my-library/my-history/my-history.component.ts
@@ -134,4 +134,12 @@ export class MyHistoryComponent implements OnInit, DisableForReuseHook {
           error: err => this.notifier.error(err.message)
         })
   }
+
+  getNoResultMessage () {
+    if (this.search) {
+      return $localize`No videos found for "${this.search}".`
+    }
+
+    return $localize`You don't have any video in your watch history yet.`
+  }
 }