diff --git a/platform/platform-api/src/com/intellij/ide/BrowserUtil.java b/platform/platform-api/src/com/intellij/ide/BrowserUtil.java
index fcd93eb80274..05799f91c093 100644
--- a/platform/platform-api/src/com/intellij/ide/BrowserUtil.java
+++ b/platform/platform-api/src/com/intellij/ide/BrowserUtil.java
@@ -227,18 +227,18 @@ public class BrowserUtil {
   }
 
   @NotNull
-  public static List<String> getOpenBrowserCommand(@NonNls @NotNull String browserPath) {
-    if (new File(browserPath).isFile()) {
-      return newSmartList(browserPath);
+  public static List<String> getOpenBrowserCommand(@NonNls @NotNull String browserPathOrName) {
+    if (new File(browserPathOrName).isFile()) {
+      return newSmartList(browserPathOrName);
     }
     else if (SystemInfo.isMac) {
-      return newArrayList(ExecUtil.getOpenCommandPath(), "-a", browserPath);
+      return newArrayList(ExecUtil.getOpenCommandPath(), "-a", browserPathOrName);
     }
     else if (SystemInfo.isWindows) {
-      return newArrayList(ExecUtil.getWindowsShellName(), "/c", "start", "\"\"", browserPath);
+      return newArrayList(ExecUtil.getWindowsShellName(), "/c", "start", "\"\"", browserPathOrName);
     }
     else {
-      return newSmartList(browserPath);
+      return newSmartList(browserPathOrName);
     }
   }
 
@@ -350,7 +350,7 @@ public class BrowserUtil {
                     myImportantOnly = importantOnly;
                   }
 
-                  public boolean accept(File dir, String name) {
+                  public boolean accept(@NotNull File dir, @NotNull String name) {
                     indicator.checkCanceled();
                     boolean result = myImportantOnly == myImportantDirs.contains(dir);
                     if (result) {
diff --git a/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java b/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java
index 5ea7b79700a1..4702fe688dfa 100644
--- a/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java
+++ b/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java
@@ -24,9 +24,7 @@ import com.intellij.openapi.components.*;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Conditions;
 import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.io.WindowsRegistryUtil;
-import com.intellij.util.SystemProperties;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters;
 import com.intellij.util.xmlb.XmlSerializer;
@@ -57,7 +55,7 @@ public class BrowsersConfiguration implements PersistentStateComponent<Element>
         return new FirefoxSettings();
       }
     },
-    CHROME(XmlBundle.message("browsers.chrome"), getWindowsPathToChrome(), "google-chrome", "Google Chrome", AllIcons.Xml.Browsers.Chrome16) {
+    CHROME(XmlBundle.message("browsers.chrome"), "chrome", "google-chrome", "Google Chrome", AllIcons.Xml.Browsers.Chrome16) {
       @Override
       public BrowserSpecificSettings createBrowserSpecificSettings() {
         return new ChromeSettings();
@@ -207,14 +205,6 @@ public class BrowsersConfiguration implements PersistentStateComponent<Element>
     }
   }
 
-  @Nullable
-  private static String getWindowsPathToChrome() {
-    if (!SystemInfo.isWindows) return null;
-
-    String localSettings = SystemProperties.getUserHome() + (SystemInfo.isWin7OrNewer ? "/AppData/Local" : "/Local Settings");
-    return FileUtil.toSystemDependentName(localSettings + "/Google/Chrome/Application/chrome.exe");
-  }
-
   public static void launchBrowser(final @NotNull BrowserFamily family, @NotNull final String url, String... parameters) {
     launchBrowser(family, url, false, parameters);
   }
diff --git a/xml/impl/src/com/intellij/ide/browsers/impl/DefaultUrlOpener.java b/xml/impl/src/com/intellij/ide/browsers/impl/DefaultUrlOpener.java
index 784ff1646232..fc50f4dd0ef2 100644
--- a/xml/impl/src/com/intellij/ide/browsers/impl/DefaultUrlOpener.java
+++ b/xml/impl/src/com/intellij/ide/browsers/impl/DefaultUrlOpener.java
@@ -78,7 +78,7 @@ public class DefaultUrlOpener extends UrlOpener {
     List<String> command = BrowserUtil.getOpenBrowserCommand(browserPath);
     addArgs(command, browserArgs, url, forceOpenNewInstanceOnMac);
     if (LOG.isDebugEnabled()) {
-      LOG.debug("Launching browser: " + StringUtil.join(browserArgs, " "));
+      LOG.debug("Launching browser: " + StringUtil.join(command, " "));
     }
     new ProcessBuilder(command).start();
   }