diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 729be638c0..454c369091 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -43,8 +43,10 @@
         self.resetEnhancements = function () {
             var footer = $("#footer");
             var videoBackdrop = $("#videoBackdrop", footer);
+            var mediaElement = $("#mediaElement", videoBackdrop);
             var nowPlayingBar = $("#nowPlayingBar", videoBackdrop);
-            footer.append(nowPlayingBar);
+            mediaElement.html(""); // remove play/pause
+            footer.append(mediaElement).append(nowPlayingBar);
             videoBackdrop.remove();
         };
 
@@ -57,6 +59,8 @@
                 document.webkitExitFullscreen();
             }
 
+            $('#videoPlayer').removeClass('fullscreenVideo');
+
             fullscreenExited = true;
         }
 
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index e470595639..43c1da0c17 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -8,19 +8,19 @@
         var currentMediaElement;
         var currentProgressInterval;
         var positionSlider;
-        self.isPositionSliderActive;
         var currentTimeElement;
         var currentItem;
-        self.volumeSlider;
         var muteButton;
         var unmuteButton;
-        self.startTimeTicksOffset;
         var curentDurationTicks;
         var canClientSeek;
-
-        self.playlist = [];
         var currentPlaylistIndex = 0;
 
+        self.isPositionSliderActive;
+        self.volumeSlider;
+        self.startTimeTicksOffset;
+        self.playlist = [];
+
         self.updateCanClientSeek = function (elem) {
             var duration = elem.duration;
             canClientSeek = duration && !isNaN(duration) && duration != Number.POSITIVE_INFINITY && duration != Number.NEGATIVE_INFINITY;
@@ -81,6 +81,10 @@
 
             if (currentItem.MediaType == "Video") {
                 ApiClient.stopActiveEncodings();
+                if (self.isFullScreen()) {
+                    self.exitFullScreen();
+                }
+                self.resetEnhancements();
             }
         }
 
@@ -1128,11 +1132,11 @@
             var footer = $('#footer');
             footer.hide();
 
-            if (elem.mediaType == "Video") {
-                self.resetEnhancements();
+            if (currentItem.MediaType == "Video") {
                 if (self.isFullScreen()) {
                     self.exitFullScreen();
                 }
+                self.resetEnhancements();
             }
         };