diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp
index 830bfd51d4..a68880d2cb 100644
--- a/src/apps/terminal/TermWindow.cpp
+++ b/src/apps/terminal/TermWindow.cpp
@@ -945,7 +945,7 @@ TermWindow::MessageReceived(BMessage *message)
 				fSavedFrame = Frame();
 				BScreen screen(this);
 
-				for (int32 i = fTabView->CountTabs() - 1; i >= 0 ; i--)
+				for (int32 i = fTabView->CountTabs() - 1; i >= 0; i--)
 					_TermViewAt(i)->ScrollBar()->ResizeBy(0,
 						(B_H_SCROLL_BAR_HEIGHT - 1));
 
@@ -965,7 +965,7 @@ TermWindow::MessageReceived(BMessage *message)
 				float mbHeight = fMenuBar->Bounds().Height() + 1;
 				fMenuBar->Show();
 
-				for (int32 i = fTabView->CountTabs() - 1; i >= 0 ; i--)
+				for (int32 i = fTabView->CountTabs() - 1; i >= 0; i--)
 					_TermViewAt(i)->ScrollBar()->ResizeBy(0,
 						-(B_H_SCROLL_BAR_HEIGHT - 1));
 
@@ -987,8 +987,11 @@ TermWindow::MessageReceived(BMessage *message)
 		case MSG_COLOR_CHANGED:
 		case MSG_COLOR_SCHEME_CHANGED:
 		{
-			_SetTermColors(_ActiveTermViewContainerView());
-			_ActiveTermViewContainerView()->Invalidate();
+			for (int32 i = fTabView->CountTabs() - 1; i >= 0; i--) {
+				TermViewContainerView* container = _TermViewContainerViewAt(i);
+				_SetTermColors(container);
+				container->Invalidate();
+			}
 			_ActiveTermView()->Invalidate();
 			break;
 		}