diff --git a/Yep/Views/Media/MediaPreviewView.swift b/Yep/Views/Media/MediaPreviewView.swift
index 14ca6ae0..9f7f83ff 100644
--- a/Yep/Views/Media/MediaPreviewView.swift
+++ b/Yep/Views/Media/MediaPreviewView.swift
@@ -239,7 +239,6 @@ class MediaPreviewView: UIView {
             self.initialframe = initialframe
 
             frame = initialframe
-
             layoutIfNeeded()
 
             UIView.animateWithDuration(0.25, delay: 0.0, options: .CurveEaseOut, animations: { _ in
diff --git a/Yep/Views/Media/MediaView.swift b/Yep/Views/Media/MediaView.swift
index 369cebce..043655c3 100644
--- a/Yep/Views/Media/MediaView.swift
+++ b/Yep/Views/Media/MediaView.swift
@@ -35,8 +35,14 @@ class MediaView: UIView {
                 coverImageView.image = coverImage
                 coverImageView.alpha = 1
                 bringSubviewToFront(coverImageView)
+
+                scrollView.alpha = 0
+                videoPlayerLayer.opacity = 0
                 
             } else {
+                scrollView.alpha = 1
+                videoPlayerLayer.opacity = 1
+
                 UIView.animateWithDuration(0.05, delay: 0.0, options: .CurveLinear, animations: { _ in
                     self.coverImageView.alpha = 0
                 }, completion: { finished in