diff --git a/AppKit/CPScrollView.j b/AppKit/CPScrollView.j
index ffc4a5378..d7f4055bb 100644
--- a/AppKit/CPScrollView.j
+++ b/AppKit/CPScrollView.j
@@ -1596,10 +1596,11 @@ Notifies the delegate when the scroll view has finished scrolling.
 
 - (void)layoutSubviews
 {
-    if (![self isCSSBased] || (_borderType === CPNoBorder))
+    if (![self isCSSBased])
         return;
 
-    [self setBackgroundColor:[self currentValueForThemeAttribute:@"background-color-"+CPScrollViewBorderSuffixes[_borderType]]];
+    if (_borderType !== CPNoBorder)
+        [self setBackgroundColor:[self currentValueForThemeAttribute:@"background-color-"+CPScrollViewBorderSuffixes[_borderType]]];
 
     if (_scrollerStyle === CPScrollerStyleLegacy)
         [[self bottomCornerView] setBackgroundColor:[self currentValueForThemeAttribute:@"bottom-corner-color"]];
diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 75b9ce0f8..664cc199e 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -595,14 +595,12 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 {
     [super setThemeState:aState];
     [self setBackgroundColor:[self hasThemeState:CPThemeStateHUD] ? [CPColor clearColor] : [CPColor whiteColor]];
-
 }
 
 - (void)unsetThemeState:(CPThemeState)aState
 {
     [super unsetThemeState:aState];
     [self setBackgroundColor:[self hasThemeState:CPThemeStateHUD] ? [CPColor clearColor] : [CPColor whiteColor]];
-
 }
 
 - (void)_initSubclass