diff --git a/src/bower_components/emby-webcomponents/fullscreen/fullscreenmanager.js b/src/bower_components/emby-webcomponents/fullscreen/fullscreenmanager.js
index d39d8fd3b6..5773e57d07 100644
--- a/src/bower_components/emby-webcomponents/fullscreen/fullscreenmanager.js
+++ b/src/bower_components/emby-webcomponents/fullscreen/fullscreenmanager.js
@@ -29,11 +29,14 @@ define(['events', 'dom'], function (events, dom) {
         }
         if (element.webkitEnterFullscreen) {
             element.webkitEnterFullscreen();
-        } 
+        }
     };
 
     fullscreenManager.prototype.exitFullscreen = function () {
 
+        if (!this.isFullScreen()) {
+            return;
+        }
         if (document.exitFullscreen) {
             document.exitFullscreen();
         } else if (document.mozCancelFullScreen) {
@@ -47,9 +50,15 @@ define(['events', 'dom'], function (events, dom) {
         }
     };
 
+    // TODO: use screenfull.js
     fullscreenManager.prototype.isFullScreen = function () {
-
-        return document.fullscreen || document.mozFullScreen || document.webkitIsFullScreen || document.msFullscreenElement ? true : false;
+        return document.fullscreen ||
+            document.mozFullScreen ||
+            document.webkitIsFullScreen ||
+            document.msFullscreenElement ||  /* IE/Edge syntax */
+            document.fullscreenElement || /* Standard syntax */
+            document.webkitFullscreenElement || /* Chrome, Safari and Opera syntax */
+            document.mozFullScreenElement; /* Firefox syntax */
     };
 
     var manager = new fullscreenManager();
@@ -71,4 +80,4 @@ define(['events', 'dom'], function (events, dom) {
     });
 
     return manager;
-});
\ No newline at end of file
+});
diff --git a/src/bower_components/emby-webcomponents/htmlvideoplayer/plugin.js b/src/bower_components/emby-webcomponents/htmlvideoplayer/plugin.js
index e723790583..d25b49163b 100644
--- a/src/bower_components/emby-webcomponents/htmlvideoplayer/plugin.js
+++ b/src/bower_components/emby-webcomponents/htmlvideoplayer/plugin.js
@@ -692,6 +692,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
 
                 dlg.parentNode.removeChild(dlg);
             }
+
             fullscreenManager.exitFullscreen();
         };