diff --git a/platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncher.java b/platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncher.java
index bad402d8dffb..965cc361e731 100644
--- a/platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncher.java
+++ b/platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,9 @@ public abstract class BrowserLauncher {
 
   public abstract void browse(@NotNull File file);
 
-  public abstract void browse(@NotNull String url, @Nullable WebBrowser browser);
+  public void browse(@NotNull String url, @Nullable WebBrowser browser) {
+    browse(url, browser, null);
+  }
 
   public abstract void browse(@NotNull String url, @Nullable WebBrowser browser, @Nullable Project project);
 
diff --git a/platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncherAppless.java b/platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncherAppless.java
index 4326378c6f57..ead0a6529a40 100644
--- a/platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncherAppless.java
+++ b/platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncherAppless.java
@@ -169,11 +169,6 @@ public class BrowserLauncherAppless extends BrowserLauncher {
     }
   }
 
-  @Override
-  public void browse(@NotNull String url, @Nullable WebBrowser browser) {
-    browse(url, browser, null);
-  }
-
   @Override
   public void browse(@NotNull String url, @Nullable WebBrowser browser, @Nullable Project project) {
     if (browser == null) {
diff --git a/xml/impl/src/com/intellij/ide/browsers/BrowserLauncherImpl.java b/xml/impl/src/com/intellij/ide/browsers/BrowserLauncherImpl.java
index 278ef3be2548..e32549fe3db8 100644
--- a/xml/impl/src/com/intellij/ide/browsers/BrowserLauncherImpl.java
+++ b/xml/impl/src/com/intellij/ide/browsers/BrowserLauncherImpl.java
@@ -67,7 +67,14 @@ public final class BrowserLauncherImpl extends BrowserLauncherAppless {
   @Override
   protected void browseUsingNotSystemDefaultBrowserPolicy(@NotNull URI uri, @NotNull GeneralSettings settings, @Nullable Project project) {
     WebBrowserManager browserManager = WebBrowserManager.getInstance();
-    if (browserManager.getDefaultBrowserPolicy() == DefaultBrowserPolicy.FIRST || (SystemInfo.isMac && "open".equals(settings.getBrowserPath()))) {
+    if (browserManager.getDefaultBrowserPolicy() == DefaultBrowserPolicy.FIRST) {
+      WebBrowser browser = browserManager.getFirstActiveBrowser();
+      if (browser != null) {
+        browse(uri.toString(), browser, project);
+        return;
+      }
+    }
+    else if (SystemInfo.isMac && "open".equals(settings.getBrowserPath())) {
       WebBrowser browser = browserManager.getFirstActiveBrowser();
       if (browser != null) {
         browseUsingPath(uri.toString(), null, browser, project, ArrayUtil.EMPTY_STRING_ARRAY);