diff --git a/src/app/components/stream/status/attachements/attachements.component.html b/src/app/components/stream/status/attachements/attachements.component.html
index f9419567..e5fa601d 100644
--- a/src/app/components/stream/status/attachements/attachements.component.html
+++ b/src/app/components/stream/status/attachements/attachements.component.html
@@ -1,43 +1,43 @@
 <div class="galery" *ngIf="imageAttachments.length > 0">
     <div class="galery__image" *ngIf="imageAttachments.length === 1">
         <app-attachement-image class="galery__img--1" 
-            [attachment]="imageAttachments[0]" (openEvent)="attachmentSelected(0)">
+            [attachment]="imageAttachments[0]" (openEvent)="attachmentSelected('image', 0)">
         </app-attachement-image>
     </div>
 
     <div class="galery__image" *ngIf="imageAttachments.length === 2">
         <app-attachement-image class="galery__img--2" 
-            [attachment]="imageAttachments[0]" (openEvent)="attachmentSelected(0)">
+            [attachment]="imageAttachments[0]" (openEvent)="attachmentSelected('image', 0)">
         </app-attachement-image>
         <app-attachement-image class="galery__img--2" 
-            [attachment]="imageAttachments[1]" (openEvent)="attachmentSelected(1)">
+            [attachment]="imageAttachments[1]" (openEvent)="attachmentSelected('image', 1)">
         </app-attachement-image>
     </div>
 
     <div class="galery__image" *ngIf="imageAttachments.length === 3">
         <app-attachement-image class="galery__img--3-1" 
-            [attachment]="imageAttachments[0]" (openEvent)="attachmentSelected(0)">
+            [attachment]="imageAttachments[0]" (openEvent)="attachmentSelected('image', 0)">
         </app-attachement-image>
         <app-attachement-image class="galery__img--3-2" 
-            [attachment]="imageAttachments[1]" (openEvent)="attachmentSelected(1)">
+            [attachment]="imageAttachments[1]" (openEvent)="attachmentSelected('image', 1)">
         </app-attachement-image>
         <app-attachement-image class="galery__img--3-2" 
-            [attachment]="imageAttachments[2]" (openEvent)="attachmentSelected(2)">
+            [attachment]="imageAttachments[2]" (openEvent)="attachmentSelected('image', 2)">
         </app-attachement-image>
     </div>
 
     <div class="galery__image" *ngIf="imageAttachments.length === 4">
         <app-attachement-image class="galery__img--4" 
-            [attachment]="imageAttachments[0]" (openEvent)="attachmentSelected(0)">
+            [attachment]="imageAttachments[0]" (openEvent)="attachmentSelected('image', 0)">
         </app-attachement-image>
         <app-attachement-image class="galery__img--4" 
-            [attachment]="imageAttachments[1]" (openEvent)="attachmentSelected(1)">
+            [attachment]="imageAttachments[1]" (openEvent)="attachmentSelected('image', 1)">
         </app-attachement-image>
         <app-attachement-image class="galery__img--4" 
-            [attachment]="imageAttachments[2]" (openEvent)="attachmentSelected(2)">
+            [attachment]="imageAttachments[2]" (openEvent)="attachmentSelected('image', 2)">
         </app-attachement-image>
         <app-attachement-image class="galery__img--4" 
-            [attachment]="imageAttachments[3]" (openEvent)="attachmentSelected(3)">
+            [attachment]="imageAttachments[3]" (openEvent)="attachmentSelected('image', 3)">
         </app-attachement-image>
     </div>    
 </div>
diff --git a/src/app/components/stream/status/attachements/attachements.component.ts b/src/app/components/stream/status/attachements/attachements.component.ts
index 89fc6a85..7860c08d 100644
--- a/src/app/components/stream/status/attachements/attachements.component.ts
+++ b/src/app/components/stream/status/attachements/attachements.component.ts
@@ -57,8 +57,14 @@ export class AttachementsComponent implements OnInit {
         });
     }
 
-    attachmentSelected(index: number): boolean {
-        let openMediaEvent = new OpenMediaEvent(index, this.attachments, null);
+    attachmentSelected(type: 'image' | 'video', index: number): boolean {
+        let openMediaEvent: OpenMediaEvent;
+        if(type === 'image'){
+            openMediaEvent = new OpenMediaEvent(index, this.imageAttachments, null);
+        } else if(type === 'video') {
+            openMediaEvent = new OpenMediaEvent(index, this.videoAttachments, null);
+        }
+
         this.navigationService.openMedia(openMediaEvent);
         return false;
     }
@@ -87,7 +93,7 @@ export class AttachementsComponent implements OnInit {
             this.onPlay();
         }
 
-        this.attachmentSelected(0);
+        this.attachmentSelected('video', 0);
         return false;
     }