diff --git a/extbrowser/src/org/netbeans/modules/extbrowser/ExtBrowserImpl.java b/extbrowser/src/org/netbeans/modules/extbrowser/ExtBrowserImpl.java
--- a/extbrowser/src/org/netbeans/modules/extbrowser/ExtBrowserImpl.java
+++ b/extbrowser/src/org/netbeans/modules/extbrowser/ExtBrowserImpl.java
@@ -96,7 +96,7 @@
                 ));
         
         String arg = extBrowserFactory.getBrowserExecutable().getArguments();
-        ExternalBrowserDescriptor desc = new ExternalBrowserDescriptor(getPluginId(url), arg);
+        ExternalBrowserDescriptor desc = new ExternalBrowserDescriptor(extBrowserFactory.getBrowserFamilyId(), arg);
         for (BrowserLookupProvider prov : Lookup.getDefault().lookupAll(BrowserLookupProvider.class)) {
             Lookup l = prov.createBrowserLookup(desc);
             if (l != null) {
@@ -107,8 +107,8 @@
         return new ProxyLookup(lookups.toArray(new Lookup[lookups.size()]));
     }
     
-    protected BrowserId getPluginId(URL url){
-        return extBrowserFactory.getBrowserFamilyId();
+    protected BrowserId getSystemDefaultPluginId(URL url){
+        return BrowserId.UNKNOWN;
     }
     
     
diff --git a/extbrowser/src/org/netbeans/modules/extbrowser/MacBrowserImpl.java b/extbrowser/src/org/netbeans/modules/extbrowser/MacBrowserImpl.java
--- a/extbrowser/src/org/netbeans/modules/extbrowser/MacBrowserImpl.java
+++ b/extbrowser/src/org/netbeans/modules/extbrowser/MacBrowserImpl.java
@@ -113,8 +113,8 @@
      * @see org.netbeans.modules.extbrowser.ExtBrowserImpl#getPluginId(java.net.URL)
      */
     @Override
-    protected BrowserId getPluginId( URL url ) {
-        BrowserId pluginId = super.getPluginId(url);
+    protected BrowserId getSystemDefaultPluginId( URL url ) {
+        BrowserId pluginId = super.getSystemDefaultPluginId(url);
         if (pluginId != BrowserId.UNKNOWN && pluginId != BrowserId.OTHER){
             return pluginId;
         }
diff --git a/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java b/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java
--- a/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java
+++ b/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java
@@ -175,8 +175,8 @@
     }
     
     @Override
-    protected BrowserId getPluginId(URL url){
-        BrowserId id = super.getPluginId(url);
+    protected BrowserId getSystemDefaultPluginId(URL url){
+        BrowserId id = super.getSystemDefaultPluginId(url);
         if (id != BrowserId.UNKNOWN && id != BrowserId.OTHER){
             return id;
         }
diff --git a/extbrowser/src/org/netbeans/modules/extbrowser/SystemDefaultBrowser.java b/extbrowser/src/org/netbeans/modules/extbrowser/SystemDefaultBrowser.java
--- a/extbrowser/src/org/netbeans/modules/extbrowser/SystemDefaultBrowser.java
+++ b/extbrowser/src/org/netbeans/modules/extbrowser/SystemDefaultBrowser.java
@@ -178,6 +178,10 @@
 
     @Override
     public BrowserId getBrowserFamilyId() {
+        HtmlBrowser.Impl impl = createHtmlBrowserImpl();
+        if (impl != null && impl instanceof ExtBrowserImpl) {
+            return ((ExtBrowserImpl)impl).getSystemDefaultPluginId(null);
+        }
         return BrowserId.UNKNOWN;
     }