diff --git a/src/kits/interface/ColorControl.cpp b/src/kits/interface/ColorControl.cpp
index 5955843336..3c0438c35c 100644
--- a/src/kits/interface/ColorControl.cpp
+++ b/src/kits/interface/ColorControl.cpp
@@ -132,13 +132,13 @@ BColorControl::_InitData(color_control_layout layout, float size,
 			fBlueText->TextView()->AllowChar(i);
 		fBlueText->TextView()->SetMaxBytes(3);
 		
-		_LayoutView();
-	
 		AddChild(fRedText);
 		AddChild(fGreenText);
 		AddChild(fBlueText);
 	}
 
+	_LayoutView();
+	
 	if (useOffscreen) {
 		BRect bounds = fPaletteFrame;
 		bounds.InsetBy(-2.0f, -2.0f); 
diff --git a/src/kits/interface/Control.cpp b/src/kits/interface/Control.cpp
index 2e643c3f69..6c85fc956c 100644
--- a/src/kits/interface/Control.cpp
+++ b/src/kits/interface/Control.cpp
@@ -114,7 +114,7 @@ BControl::Archive(BMessage *archive, bool deep) const
 	status_t status = BView::Archive(archive, deep);
 
 	if (status == B_OK && Message())
-		status = archive->AddMessage("_msg", Message ());
+		status = archive->AddMessage("_msg", Message());
 
 	if (status == B_OK && fLabel)
 		status = archive->AddString("_label", fLabel);