diff --git a/xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java b/xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java
index 097a1d1859fc..be5151bb06a5 100644
--- a/xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java
+++ b/xml/impl/src/com/intellij/ide/browsers/impl/WebBrowserServiceImpl.java
@@ -39,9 +39,18 @@ public class WebBrowserServiceImpl extends WebBrowserService {
   public Collection<Url> getUrlsToOpen(@NotNull OpenInBrowserRequest request, boolean preferLocalUrl) throws WebBrowserUrlProvider.BrowserException {
     boolean isHtmlOrXml = isHtmlOrXmlFile(request.getFile().getViewProvider().getBaseLanguage());
     if (!preferLocalUrl || !isHtmlOrXml) {
-      Collection<Url> urls = getUrls(request);
-      if (!isHtmlOrXml || !urls.isEmpty()) {
-        return urls;
+      DumbService dumbService = DumbService.getInstance(request.getProject());
+      for (WebBrowserUrlProvider urlProvider : WebBrowserUrlProvider.EP_NAME.getExtensions()) {
+        if ((!dumbService.isDumb() || DumbService.isDumbAware(urlProvider)) && urlProvider.canHandleElement(request)) {
+          Collection<Url> urls = getUrls(urlProvider, request);
+          if (!urls.isEmpty()) {
+            return urls;
+          }
+        }
+      }
+
+      if (!isHtmlOrXml) {
+        return Collections.emptyList();
       }
     }
 
@@ -52,8 +61,7 @@ public class WebBrowserServiceImpl extends WebBrowserService {
   }
 
   @NotNull
-  private static Collection<Url> getUrls(@NotNull OpenInBrowserRequest request) throws WebBrowserUrlProvider.BrowserException {
-    WebBrowserUrlProvider provider = getProvider(request);
+  private static Collection<Url> getUrls(@Nullable WebBrowserUrlProvider provider, @NotNull OpenInBrowserRequest request) throws WebBrowserUrlProvider.BrowserException {
     if (provider != null) {
       if (request.getResult() != null) {
         return request.getResult();
@@ -86,7 +94,7 @@ public class WebBrowserServiceImpl extends WebBrowserService {
   public static Collection<Url> getDebuggableUrls(@Nullable PsiElement context) {
     try {
       OpenInBrowserRequest request = context == null ? null : OpenInBrowserRequest.create(context);
-      return request == null || request.getFile().getViewProvider().getBaseLanguage() == XMLLanguage.INSTANCE ? Collections.<Url>emptyList() : getUrls(request);
+      return request == null || request.getFile().getViewProvider().getBaseLanguage() == XMLLanguage.INSTANCE ? Collections.<Url>emptyList() : getUrls(getProvider(request), request);
     }
     catch (WebBrowserUrlProvider.BrowserException ignored) {
       return Collections.emptyList();
diff --git a/xml/openapi/src/com/intellij/ide/browsers/WebBrowserService.java b/xml/openapi/src/com/intellij/ide/browsers/WebBrowserService.java
index 46df2cb2f37a..8876cef77036 100644
--- a/xml/openapi/src/com/intellij/ide/browsers/WebBrowserService.java
+++ b/xml/openapi/src/com/intellij/ide/browsers/WebBrowserService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -20,12 +20,10 @@ import com.intellij.lang.html.HTMLLanguage;
 import com.intellij.lang.xhtml.XHTMLLanguage;
 import com.intellij.lang.xml.XMLLanguage;
 import com.intellij.openapi.components.ServiceManager;
-import com.intellij.psi.PsiElement;
 import com.intellij.util.Url;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
-import java.util.Collections;
 
 public abstract class WebBrowserService {
   public static WebBrowserService getInstance() {
@@ -35,14 +33,6 @@ public abstract class WebBrowserService {
   @NotNull
   public abstract Collection<Url> getUrlsToOpen(@NotNull OpenInBrowserRequest request, boolean preferLocalUrl) throws WebBrowserUrlProvider.BrowserException;
 
-  @SuppressWarnings("unused")
-  @NotNull
-  @Deprecated
-  public Collection<Url> getUrlsToOpen(@NotNull final PsiElement element, boolean preferLocalUrl) throws WebBrowserUrlProvider.BrowserException {
-    OpenInBrowserRequest request = OpenInBrowserRequest.create(element);
-    return request == null ? Collections.<Url>emptyList() : getUrlsToOpen(request, preferLocalUrl);
-  }
-
   public static boolean isHtmlOrXmlFile(@NotNull Language language) {
     return language == HTMLLanguage.INSTANCE || language == XHTMLLanguage.INSTANCE || language == XMLLanguage.INSTANCE;
   }