diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index f11552ef6..627187bd0 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -51,5 +51,6 @@ footer {
   padding: 10px 0;
   text-align: center;
   font-size: 11px;
-  margin-top: 30px;
+  margin-top: $footer-margin;
+  height: $footer-height;
 }
diff --git a/client/src/app/videos/video-list/video-list.component.html b/client/src/app/videos/video-list/video-list.component.html
index 72d5512a6..f80592279 100644
--- a/client/src/app/videos/video-list/video-list.component.html
+++ b/client/src/app/videos/video-list/video-list.component.html
@@ -22,7 +22,7 @@
   </my-video-miniature>
 </div>
 
-<pagination *ngIf="pagination.totalItems !== null"
+<pagination *ngIf="pagination.totalItems !== null && pagination.totalItems !== 0"
   [totalItems]="pagination.totalItems" [itemsPerPage]="pagination.itemsPerPage" [maxSize]="6" [boundaryLinks]="true" [rotate]="false"
   [(ngModel)]="pagination.currentPage" (pageChanged)="onPageChanged($event)"
 ></pagination>
diff --git a/client/src/app/videos/video-list/video-list.component.scss b/client/src/app/videos/video-list/video-list.component.scss
index eddcf0776..b48a4f125 100644
--- a/client/src/app/videos/video-list/video-list.component.scss
+++ b/client/src/app/videos/video-list/video-list.component.scss
@@ -18,7 +18,6 @@
 }
 
 .videos-miniatures {
-  min-height: 720px;
   text-align: center;
   padding-top: 0;
 
diff --git a/client/src/sass/_variables.scss b/client/src/sass/_variables.scss
index 5c06fae9d..f0ffb43ba 100644
--- a/client/src/sass/_variables.scss
+++ b/client/src/sass/_variables.scss
@@ -9,6 +9,9 @@ $menu-color-block: #686f77;
 $header-height: 65px;
 $header-border-color: #e9eff6;
 
+$footer-height: 30px;
+$footer-margin: 30px;
+
 $footer-border-color: $header-border-color;
 
 $video-miniature-other-infos: #686767;
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index c0b40445e..b446dde2a 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -40,6 +40,10 @@ input.readonly {
   position: fixed;
 }
 
+.main-row {
+  min-height: calc(100vh - #{$header-height} - #{$footer-height} - #{$footer-margin});
+}
+
 .main-col {
 
   .content-padding {