diff --git a/src/components/fullscreen/fullscreen-dc.js b/src/components/fullscreen/fullscreen-dc.js
deleted file mode 100644
index bc12a6a76d..0000000000
--- a/src/components/fullscreen/fullscreen-dc.js
+++ /dev/null
@@ -1,26 +0,0 @@
-define(['dom', 'fullscreenManager'], function (dom, fullscreenManager) {
-    'use strict';
-
-    function isTargetValid(target) {
-
-        if (dom.parentWithTag(target, ['BUTTON', 'INPUT', 'TEXTAREA'])) {
-            return false;
-        }
-
-        return true;
-    }
-
-    dom.addEventListener(window, 'dblclick', function (e) {
-
-        if (isTargetValid(e.target)) {
-            if (fullscreenManager.isFullScreen()) {
-                fullscreenManager.exitFullscreen();
-            } else {
-                fullscreenManager.requestFullscreen();
-            }
-        }
-
-    }, {
-        passive: true
-    });
-});
\ No newline at end of file
diff --git a/src/components/fullscreen/fullscreenmanager.js b/src/components/fullscreenManager.js
similarity index 76%
rename from src/components/fullscreen/fullscreenmanager.js
rename to src/components/fullscreenManager.js
index 5773e57d07..0a43a764a5 100644
--- a/src/components/fullscreen/fullscreenmanager.js
+++ b/src/components/fullscreenManager.js
@@ -1,4 +1,4 @@
-define(['events', 'dom'], function (events, dom) {
+define(['events', 'dom', 'apphost', 'browser'], function (events, dom, appHost, browser) {
     'use strict';
 
     function fullscreenManager() {
@@ -79,5 +79,30 @@ define(['events', 'dom'], function (events, dom) {
         passive: true
     });
 
+    if (appHost.supports("fullscreenchange") && (browser.edgeUwp || -1 !== navigator.userAgent.toLowerCase().indexOf("electron"))) {
+        function isTargetValid(target) {
+
+            if (dom.parentWithTag(target, ['BUTTON', 'INPUT', 'TEXTAREA'])) {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        dom.addEventListener(window, 'dblclick', function (e) {
+    
+            if (isTargetValid(e.target)) {
+                if (manager.isFullScreen()) {
+                    manager.exitFullscreen();
+                } else {
+                    manager.requestFullscreen();
+                }
+            }
+    
+        }, {
+            passive: true
+        });
+    }
+
     return manager;
 });
diff --git a/src/scripts/site.js b/src/scripts/site.js
index d951fd3c7e..12526a56b9 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -618,11 +618,7 @@ var AppInfo = {};
                         }
                     }
 
-                    require(["playerSelectionMenu"]);
-
-                    if (appHost.supports("fullscreenchange") && (browser.edgeUwp || -1 !== navigator.userAgent.toLowerCase().indexOf("electron"))) {
-                        require(["fullscreen-doubleclick"]);
-                    }
+                    require(["playerSelectionMenu", "fullscreenManager"]);
 
                     if (appHost.supports("sync")) {
                         initLocalSyncEvents();
@@ -779,7 +775,7 @@ var AppInfo = {};
         define("searchResults", [componentsPath + "/search/searchresults"], returnFirstDependency);
         define("upNextDialog", [componentsPath + "/upnextdialog/upnextdialog"], returnFirstDependency);
         define("fullscreen-doubleclick", [componentsPath + "/fullscreen/fullscreen-dc"], returnFirstDependency);
-        define("fullscreenManager", [componentsPath + "/fullscreen/fullscreenmanager", "events"], returnFirstDependency);
+        define("fullscreenManager", [componentsPath + "/fullscreenManager", "events"], returnFirstDependency);
         define("headroom", [componentsPath + "/headroom/headroom"], returnFirstDependency);
         define("subtitleAppearanceHelper", [componentsPath + "/subtitlesettings/subtitleappearancehelper"], returnFirstDependency);
         define("subtitleSettings", [componentsPath + "/subtitlesettings/subtitlesettings"], returnFirstDependency);