diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index e4eecec18f..65eed1a235 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Controller
     public interface IServerApplicationHost : IApplicationHost
     {
         event EventHandler HasUpdateAvailableChanged;
-        
+
         /// <summary>
         /// Gets the system info.
         /// </summary>
@@ -86,5 +86,7 @@ namespace MediaBrowser.Controller
         /// <param name="ipAddress">The ip address.</param>
         /// <returns>System.String.</returns>
         string GetLocalApiUrl(IPAddress ipAddress);
+
+        void LaunchUrl(string url);
     }
 }
diff --git a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs
index 72c191121a..fbfef9a34d 100644
--- a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs
+++ b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs
@@ -222,6 +222,11 @@ namespace MediaBrowser.Server.Mono.Native
             return GetInfo(Environment);
         }
 
+        public void LaunchUrl(string url)
+        {
+            throw new NotImplementedException();
+        }
+
         public static FFMpegInstallInfo GetInfo(NativeEnvironment environment)
         {
             var info = new FFMpegInstallInfo();
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index 93dbe2945c..2e2b42ba2b 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -1404,5 +1404,10 @@ namespace MediaBrowser.Server.Startup.Common
                 return externalDns;
             }
         }
+
+        public void LaunchUrl(string url)
+        {
+            NativeApp.LaunchUrl(url);
+        }
     }
 }
diff --git a/MediaBrowser.Server.Startup.Common/Browser/BrowserLauncher.cs b/MediaBrowser.Server.Startup.Common/Browser/BrowserLauncher.cs
index a4504f25a6..db48d1110e 100644
--- a/MediaBrowser.Server.Startup.Common/Browser/BrowserLauncher.cs
+++ b/MediaBrowser.Server.Startup.Common/Browser/BrowserLauncher.cs
@@ -15,87 +15,58 @@ namespace MediaBrowser.Server.Startup.Common.Browser
         /// </summary>
         /// <param name="page">The page.</param>
         /// <param name="appHost">The app host.</param>
-        /// <param name="logger">The logger.</param>
-        public static void OpenDashboardPage(string page, IServerApplicationHost appHost, ILogger logger)
+        public static void OpenDashboardPage(string page, IServerApplicationHost appHost)
         {
             var url = appHost.GetLocalApiUrl("localhost") + "/web/" + page;
 
-            OpenUrl(url, logger);
+            OpenUrl(appHost, url);
         }
 
         /// <summary>
         /// Opens the community.
         /// </summary>
-        /// <param name="logger">The logger.</param>
-        public static void OpenCommunity(ILogger logger)
+        public static void OpenCommunity(IServerApplicationHost appHost)
         {
-            OpenUrl("http://emby.media/community", logger);
+            OpenUrl(appHost, "http://emby.media/community");
         }
 
         /// <summary>
         /// Opens the web client.
         /// </summary>
         /// <param name="appHost">The app host.</param>
-        /// <param name="logger">The logger.</param>
-        public static void OpenWebClient(IServerApplicationHost appHost, ILogger logger)
+        public static void OpenWebClient(IServerApplicationHost appHost)
         {
-            OpenDashboardPage("index.html", appHost, logger);
+            OpenDashboardPage("index.html", appHost);
         }
 
         /// <summary>
         /// Opens the dashboard.
         /// </summary>
         /// <param name="appHost">The app host.</param>
-        /// <param name="logger">The logger.</param>
-        public static void OpenDashboard(IServerApplicationHost appHost, ILogger logger)
+        public static void OpenDashboard(IServerApplicationHost appHost)
         {
-            OpenDashboardPage("dashboard.html", appHost, logger);
+            OpenDashboardPage("dashboard.html", appHost);
         }
 
         /// <summary>
         /// Opens the URL.
         /// </summary>
         /// <param name="url">The URL.</param>
-        /// <param name="logger">The logger.</param>
-        private static void OpenUrl(string url, ILogger logger)
+        private static void OpenUrl(IServerApplicationHost appHost, string url)
         {
-            var process = new Process
-            {
-                StartInfo = new ProcessStartInfo
-                {
-                    FileName = url
-                },
-
-                EnableRaisingEvents = true,
-            };
-
-            process.Exited += ProcessExited;
-
             try
             {
-                process.Start();
+                appHost.LaunchUrl(url);
+            }
+            catch (NotImplementedException)
+            {
+                
             }
             catch (Exception ex)
             {
-                logger.ErrorException("Error launching url: {0}", ex, url);
-
-                Console.WriteLine("Error launching url: {0}", ex.Message);
+                Console.WriteLine("Error launching url: " + url);
                 Console.WriteLine(ex.Message);
-
-//#if !__MonoCS__
-//                System.Windows.Forms.MessageBox.Show("There was an error launching your web browser. Please check your default browser settings.");
-//#endif
             }
         }
-
-        /// <summary>
-        /// Processes the exited.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
-        private static void ProcessExited(object sender, EventArgs e)
-        {
-            ((Process)sender).Dispose();
-        }
     }
 }
diff --git a/MediaBrowser.Server.Startup.Common/EntryPoints/StartupWizard.cs b/MediaBrowser.Server.Startup.Common/EntryPoints/StartupWizard.cs
index 854fa44c1e..f9d173c595 100644
--- a/MediaBrowser.Server.Startup.Common/EntryPoints/StartupWizard.cs
+++ b/MediaBrowser.Server.Startup.Common/EntryPoints/StartupWizard.cs
@@ -46,7 +46,7 @@ namespace MediaBrowser.Server.Startup.Common.EntryPoints
         /// </summary>
         private void LaunchStartupWizard()
         {
-            BrowserLauncher.OpenDashboardPage("wizardstart.html", _appHost, _logger);
+            BrowserLauncher.OpenDashboardPage("wizardstart.html", _appHost);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Startup.Common/INativeApp.cs b/MediaBrowser.Server.Startup.Common/INativeApp.cs
index 00f987d3cd..c0758b47f5 100644
--- a/MediaBrowser.Server.Startup.Common/INativeApp.cs
+++ b/MediaBrowser.Server.Startup.Common/INativeApp.cs
@@ -102,5 +102,7 @@ namespace MediaBrowser.Server.Startup.Common
         IPowerManagement GetPowerManagement();
 
         FFMpegInstallInfo GetFfmpegInstallInfo();
+
+        void LaunchUrl(string url);
     }
 }
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index 4dc8a47f5b..454c415a13 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -317,7 +317,7 @@ namespace MediaBrowser.ServerApplication
         {
             if (e.Reason == SessionSwitchReason.SessionLogon)
             {
-                BrowserLauncher.OpenDashboard(_appHost, _logger);
+                BrowserLauncher.OpenDashboard(_appHost);
             }
         }
 
diff --git a/MediaBrowser.ServerApplication/Native/WindowsApp.cs b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
index ff5fe4d840..10cd59436d 100644
--- a/MediaBrowser.ServerApplication/Native/WindowsApp.cs
+++ b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
@@ -1,14 +1,17 @@
-using MediaBrowser.Common.Net;
+using System;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Server.Startup.Common;
 using MediaBrowser.ServerApplication.Networking;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Windows.Forms;
 using CommonIO;
 using MediaBrowser.Controller.Power;
 using MediaBrowser.Server.Startup.Common.FFMpeg;
+using OperatingSystem = MediaBrowser.Server.Startup.Common.OperatingSystem;
 
 namespace MediaBrowser.ServerApplication.Native
 {
@@ -162,6 +165,42 @@ namespace MediaBrowser.ServerApplication.Native
             return info;
         }
 
+        public void LaunchUrl(string url)
+        {
+            var process = new Process
+            {
+                StartInfo = new ProcessStartInfo
+                {
+                    FileName = url
+                },
+
+                EnableRaisingEvents = true,
+            };
+
+            process.Exited += ProcessExited;
+
+            try
+            {
+                process.Start();
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error launching url: {0}", ex, url);
+
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Processes the exited.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
+        private static void ProcessExited(object sender, EventArgs e)
+        {
+            ((Process)sender).Dispose();
+        }
+
         private string[] GetDownloadUrls()
         {
             switch (Environment.SystemArchitecture)
diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
index 2146274af2..27816db5a4 100644
--- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
+++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
@@ -168,7 +168,7 @@ namespace MediaBrowser.ServerApplication
 
         void notifyIcon1_DoubleClick(object sender, EventArgs e)
         {
-            BrowserLauncher.OpenDashboard(_appHost, _logger);
+            BrowserLauncher.OpenDashboard(_appHost);
         }
 
         private void LocalizeText()
@@ -199,17 +199,17 @@ namespace MediaBrowser.ServerApplication
 
         void cmdBrowse_Click(object sender, EventArgs e)
         {
-            BrowserLauncher.OpenWebClient(_appHost, _logger);
+            BrowserLauncher.OpenWebClient(_appHost);
         }
 
         void cmdCommunity_Click(object sender, EventArgs e)
         {
-            BrowserLauncher.OpenCommunity(_logger);
+            BrowserLauncher.OpenCommunity(_appHost);
         }
 
         void cmdConfigure_Click(object sender, EventArgs e)
         {
-            BrowserLauncher.OpenDashboard(_appHost, _logger);
+            BrowserLauncher.OpenDashboard(_appHost);
         }
 
         void cmdRestart_Click(object sender, EventArgs e)