diff --git a/dashboard-ui/components/paperdialoghelper.js b/dashboard-ui/components/paperdialoghelper.js
index ddc63cbfd..5ac8fa84a 100644
--- a/dashboard-ui/components/paperdialoghelper.js
+++ b/dashboard-ui/components/paperdialoghelper.js
@@ -55,6 +55,9 @@
         if ($.browser.msie) {
             return false;
         }
+        if ($.browser.edge) {
+            return false;
+        }
         return true;
     }
 
diff --git a/dashboard-ui/devices/ie/ie.js b/dashboard-ui/devices/ie/ie.js
index e5f66d3ed..5527208e8 100644
--- a/dashboard-ui/devices/ie/ie.js
+++ b/dashboard-ui/devices/ie/ie.js
@@ -6,15 +6,13 @@
 
         var page = this;
 
-        if (navigator.userAgent.toLowerCase().indexOf('Windows NT 10.') != -1) {
+        if (navigator.userAgent.toLowerCase().indexOf('windows nt 10.') != -1) {
 
-            var expectedValue = new Date().toDateString();
+            var expectedValue = new Date().toDateString() + "1";
             if (appStorage.getItem("ieswitchtoedge") == expectedValue) {
                 return;
             }
 
-            appStorage.setItem("ieswitchtoedge", expectedValue);
-
             var msg = Globalize.translate('MessageTryMicrosoftEdge');
 
             msg += "<br/><br/>";
@@ -24,6 +22,8 @@
                 message: msg,
                 title: Globalize.translate('HeaderTryMicrosoftEdge')
             });
+
+            appStorage.setItem("ieswitchtoedge", expectedValue);
         }
     }
 
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 5fb45da29..c33b8dce8 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -147,7 +147,7 @@
                 });
             }
 
-            if ($.browser.chrome) {
+            if ($.browser.chrome || $.browser.edge) {
                 profile.DirectPlayProfiles.push({
                     Container: 'mkv,mov',
                     Type: 'Video',
@@ -466,11 +466,11 @@
 
             profile.ResponseProfiles = [];
 
-            //profile.ResponseProfiles.push({
-            //    Type: 'Video',
-            //    Container: 'mkv',
-            //    MimeType: 'video/webm'
-            //});
+            profile.ResponseProfiles.push({
+                Type: 'Video',
+                Container: 'mkv',
+                MimeType: 'video/mp4'
+            });
 
             profile.ResponseProfiles.push({
                 Type: 'Video',
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index ebb24dede..803eb0023 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -4,7 +4,7 @@
         crossDomain: true
     });
 
-    if ($.browser.msie) {
+    if ($.browser.msie || $.browser.edge) {
 
         // This is unfortunately required due to IE's over-aggressive caching. 
         // https://github.com/MediaBrowser/MediaBrowser/issues/179
@@ -504,7 +504,7 @@ var Dashboard = {
         } else {
 
             // IE renders it incorrectly
-            if (!$.browser.msie) {
+            if (!$.browser.msie && !$.browser.edge) {
                 elem = document.createElement("paper-spinner");
                 elem.classList.add('docspinner');
 
@@ -2054,7 +2054,7 @@ var AppInfo = {};
 
         var urlArgs = "v=" + window.dashboardVersion;
 
-        if ($.browser.msie) {
+        if ($.browser.msie || $.browser.edge) {
             urlArgs += new Date().getTime();
         }