diff --git a/core.windows/src/org/netbeans/core/windows/view/ui/DefaultSeparateContainer.java b/core.windows/src/org/netbeans/core/windows/view/ui/DefaultSeparateContainer.java
--- a/core.windows/src/org/netbeans/core/windows/view/ui/DefaultSeparateContainer.java
+++ b/core.windows/src/org/netbeans/core/windows/view/ui/DefaultSeparateContainer.java
@@ -64,6 +64,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.netbeans.core.windows.options.WinSysPrefs;
+import org.netbeans.core.windows.view.ui.tabcontrol.TabbedComponentFactory;
+import org.openide.util.Lookup;
 import org.openide.windows.WindowManager;
 
 
@@ -111,12 +113,14 @@
     
     protected Tabbed createTabbed() {
         Tabbed tabbed;
+        TabbedComponentFactory componentFactory = Lookup.getDefault().lookup(TabbedComponentFactory.class);
         if(getKind() == Constants.MODE_KIND_EDITOR) {
-            tabbed = new TabbedAdapter(Constants.MODE_KIND_EDITOR);
+
+            tabbed = componentFactory.getTabbedComponent(Constants.MODE_KIND_EDITOR);
         } else {
-            tabbed = new TabbedAdapter(Constants.MODE_KIND_VIEW);
+            tabbed = componentFactory.getTabbedComponent(Constants.MODE_KIND_VIEW);
         }
-        return tabbed;    
+        return tabbed;
     }    
     
     protected void updateTitle (String title) {
diff --git a/core.windows/src/org/netbeans/core/windows/view/ui/DefaultSplitContainer.java b/core.windows/src/org/netbeans/core/windows/view/ui/DefaultSplitContainer.java
--- a/core.windows/src/org/netbeans/core/windows/view/ui/DefaultSplitContainer.java
+++ b/core.windows/src/org/netbeans/core/windows/view/ui/DefaultSplitContainer.java
@@ -49,11 +49,12 @@
 import org.netbeans.core.windows.view.ViewElement;
 import org.netbeans.core.windows.view.dnd.TopComponentDroppable;
 import org.netbeans.core.windows.view.dnd.WindowDnDManager;
-import org.netbeans.core.windows.view.ui.tabcontrol.TabbedAdapter;
 import org.openide.windows.TopComponent;
 
 import javax.swing.*;
 import java.awt.*;
+import org.netbeans.core.windows.view.ui.tabcontrol.TabbedComponentFactory;
+import org.openide.util.Lookup;
 
 
 /**
@@ -92,12 +93,14 @@
     
     protected Tabbed createTabbed() {
         Tabbed tabbed;
+        TabbedComponentFactory componentFactory = Lookup.getDefault().lookup(TabbedComponentFactory.class);
         if(getKind() == Constants.MODE_KIND_EDITOR) {
-            tabbed = new TabbedAdapter(Constants.MODE_KIND_EDITOR);
+
+            tabbed = componentFactory.getTabbedComponent(Constants.MODE_KIND_EDITOR);
         } else {
-            tabbed = new TabbedAdapter(Constants.MODE_KIND_VIEW);
+            tabbed = componentFactory.getTabbedComponent(Constants.MODE_KIND_VIEW);
         }
-        return tabbed;    
+        return tabbed;
     }    
     
     protected void updateTitle(String title) {