diff --git a/src/apps/terminal/AppearPrefView.cpp b/src/apps/terminal/AppearPrefView.cpp
index 7da4e58cd4..4d2a291561 100644
--- a/src/apps/terminal/AppearPrefView.cpp
+++ b/src/apps/terminal/AppearPrefView.cpp
@@ -291,6 +291,7 @@ AppearancePrefView::MessageReceived(BMessage* msg)
 					_EnableCustomColors(true);
 				else
 					_EnableCustomColors(false);
+
 				_ChangeColorScheme(newScheme);
 				modified = true;
 			}
@@ -393,14 +394,13 @@ AppearancePrefView::_SetCurrentColorScheme(BMenuField* field)
 
 	const char* currentSchemeName = NULL;
 
-	color_scheme** schemes
-		= const_cast<color_scheme**>(gPredefinedColorSchemes);
-	while (*schemes) {
+	for (color_scheme** schemes
+				= const_cast<color_scheme**>(gPredefinedColorSchemes);
+			*schemes != NULL; schemes++) {
 		if (gCustomColorScheme == **schemes) {
 			currentSchemeName = (*schemes)->name;
 			break;
 		}
-		schemes++;
 	}
 
 	for (int32 i = 0; i < fColorSchemeField->Menu()->CountItems(); i++) {
diff --git a/src/apps/terminal/Colors.cpp b/src/apps/terminal/Colors.cpp
index 7125514330..1eae1d6417 100644
--- a/src/apps/terminal/Colors.cpp
+++ b/src/apps/terminal/Colors.cpp
@@ -14,7 +14,7 @@
 
 
 // Standard colors
-const rgb_color kBlack= { 0, 0, 0, 255 };
+const rgb_color kBlack = { 0, 0, 0, 255 };
 const rgb_color kGreen = { 0, 255, 0, 255 };
 const rgb_color kWhite = { 255, 255, 255, 255 };
 const rgb_color kYellow = { 255, 255, 0, 255 };