diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index e597f2646..32b24ef97 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -3950,6 +3950,9 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     // FIXME: yuck!
     var identifier = [aDataView identifier];
 
+    if ([aDataView hasThemeState:CPThemeStateSelectedDataView])
+        [aDataView unsetThemeState:CPThemeStateSelectedDataView];
+
     if (!_cachedDataViews[identifier])
         _cachedDataViews[identifier] = [aDataView];
     else