diff --git a/enaml/qt/docking/dock_overlay.py b/enaml/qt/docking/dock_overlay.py
index f2f806566..e671f4139 100644
--- a/enaml/qt/docking/dock_overlay.py
+++ b/enaml/qt/docking/dock_overlay.py
@@ -6,13 +6,14 @@
 # The full license is in the file COPYING.txt, distributed with this software.
 #------------------------------------------------------------------------------
 from PyQt4.QtCore import Qt, QPoint, QRect, QTimer, QPropertyAnimation
-from PyQt4.QtGui import QRubberBand, QSplitterHandle, QTabWidget
+from PyQt4.QtGui import QRubberBand
 
 from atom.api import Atom, Bool, Int, Float, Typed
 
 from .q_guide_rose import QGuideRose
 from .q_dock_container import QDockContainer
 from .q_dock_splitter import QDockSplitterHandle
+from .q_dock_tab_widget import QDockTabWidget
 
 
 class DockOverlay(Atom):
@@ -392,9 +393,9 @@ def mouse_over_area(self, area, widget, pos):
         target_mode = Mode.Border
         if isinstance(widget, QDockContainer):
             target_mode |= Mode.CompassEx
-        elif isinstance(widget, QTabWidget):
+        elif isinstance(widget, QDockTabWidget):
             target_mode |= Mode.Compass
-        elif isinstance(widget, QSplitterHandle):
+        elif isinstance(widget, QDockSplitterHandle):
             if widget.orientation() == Qt.Horizontal:
                 target_mode |= Mode.SplitHorizontal
             else:
diff --git a/enaml/qt/docking/q_dock_area.py b/enaml/qt/docking/q_dock_area.py
index 8bd33e80f..ed2b027e6 100644
--- a/enaml/qt/docking/q_dock_area.py
+++ b/enaml/qt/docking/q_dock_area.py
@@ -182,18 +182,18 @@ def __init__(self, parent=None):
                 border-bottom-right-radius: 3px;
             }
 
-            QTabWidget QDockItem {
+            QDockTabWidget QDockItem {
                 border-top-left-radius: 0px;
                 border-top-right-radius: 0px;
                 border-bottom-left-radius: 0px;
                 border-bottom-right-radius: 0px;
             }
 
-            QTabWidget[tabPosition="3"]::tab-bar {
+            QDockTabWidget[tabPosition="3"]::tab-bar {
                 right: 2px;  /* adjust the unsightly gap */
             }
 
-            QTabWidget[tabPosition="1"]::tab-bar {
+            QDockTabWidget[tabPosition="1"]::tab-bar {
                 bottom: 2px;  /* adjust the unsightly gap */
             }