diff --git a/src/apps/charactermap/CharacterWindow.cpp b/src/apps/charactermap/CharacterWindow.cpp
index 05b5b433cc..bbda7fe2a1 100644
--- a/src/apps/charactermap/CharacterWindow.cpp
+++ b/src/apps/charactermap/CharacterWindow.cpp
@@ -203,19 +203,20 @@ CharacterWindow::CharacterWindow()
 
 	BLayoutBuilder::Group<>(this, B_VERTICAL)
 		.Add(menuBar)
-		.AddGroup(B_HORIZONTAL, 10)
-			.SetInsets(10)
-			.AddGroup(B_VERTICAL, 10)
-				.AddGroup(B_HORIZONTAL, 10)
+		.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
+			.SetInsets(B_USE_DEFAULT_SPACING, 0, B_USE_DEFAULT_SPACING,
+				B_USE_DEFAULT_SPACING)
+			.AddGroup(B_VERTICAL, B_USE_DEFAULT_SPACING)
+				.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
 					.Add(fFilterControl)
 					.Add(clearButton)
 				.End()
 				.Add(unicodeScroller)
 			.End()
-			.AddGroup(B_VERTICAL, 10)
+			.AddGroup(B_VERTICAL, B_USE_DEFAULT_SPACING)
 				.Add(characterScroller)
 				.Add(fFontSizeSlider)
-				.AddGroup(B_HORIZONTAL, 0)
+				.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
 					.Add(fGlyphView)
 					.Add(fCodeView);