diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html
index fb6d08167..2588b9af5 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
@@ -108,10 +108,23 @@
                     </div>
                   </div>
 
-                  <my-video-actions-dropdown
-                    placement="bottom auto" buttonDirection="horizontal" [buttonStyled]="true" [video]="video" [videoCaptions]="videoCaptions"
-                    (videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()"
-                  ></my-video-actions-dropdown>
+                  <ng-container *ngIf="!isUserLoggedIn()">
+                    <button
+                      *ngIf="isVideoDownloadable()" class="action-button action-button-save"
+                      (click)="showDownloadModal()" (keydown.enter)="showDownloadModal()"
+                    >
+                      <my-global-icon iconName="download" aria-hidden="true"></my-global-icon>
+                      <span class="icon-text d-none d-sm-inline" i18n>DOWNLOAD</span>
+                    </button>
+                  
+                    <my-video-download #videoDownloadModal></my-video-download>
+                  </ng-container>
+                  <ng-container *ngIf="isUserLoggedIn()">
+                    <my-video-actions-dropdown
+                      placement="bottom auto" buttonDirection="horizontal" [buttonStyled]="true" [video]="video" [videoCaptions]="videoCaptions"
+                      (videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()"
+                    ></my-video-actions-dropdown>
+                  </ng-container>
                 </div>
 
                 <div class="video-info-likes-dislikes-bar-outer-container">
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index 4341514cd..e355faf25 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -28,6 +28,7 @@ import { environment } from '../../../environments/environment'
 import { VideoShareComponent } from './modal/video-share.component'
 import { VideoSupportComponent } from './modal/video-support.component'
 import { VideoWatchPlaylistComponent } from './video-watch-playlist.component'
+import { VideoDownloadComponent } from '@app/shared/shared-video-miniature'
 
 @Component({
   selector: 'my-video-watch',
@@ -41,6 +42,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
   @ViewChild('videoShareModal') videoShareModal: VideoShareComponent
   @ViewChild('videoSupportModal') videoSupportModal: VideoSupportComponent
   @ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent
+  @ViewChild('videoDownloadModal') videoDownloadModal: VideoDownloadComponent
 
   player: any
   playerElement: HTMLVideoElement
@@ -201,6 +203,14 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     this.completeDescriptionShown = false
   }
 
+  showDownloadModal () {
+    this.videoDownloadModal.show(this.video, this.videoCaptions)
+  }
+
+  isVideoDownloadable () {
+    return this.video && this.video instanceof VideoDetails && this.video.downloadEnabled
+  }
+
   loadCompleteDescription () {
     this.descriptionLoading = true