diff --git a/headers/os/interface/InterfaceDefs.h b/headers/os/interface/InterfaceDefs.h
index e33e5f7621..40f2d89365 100644
--- a/headers/os/interface/InterfaceDefs.h
+++ b/headers/os/interface/InterfaceDefs.h
@@ -229,16 +229,16 @@ enum vertical_alignment {
 
 enum {
 	B_USE_DEFAULT_SPACING = -2,
-	B_USE_ITEM_SPACING = -2,
-	B_USE_ITEM_INSETS = -2,
-	B_USE_HALF_ITEM_SPACING = -3,
-	B_USE_HALF_ITEM_INSETS = -3,
-	B_USE_WINDOW_INSETS = -4,
-	B_USE_WINDOW_SPACING = -4,
-	B_USE_SMALL_INSETS = -5,
-	B_USE_SMALL_SPACING = -5,
-	B_USE_BIG_INSETS = -6,
-	B_USE_BIG_SPACING = -6
+	B_USE_ITEM_SPACING = -3,
+	B_USE_ITEM_INSETS = -3,
+	B_USE_HALF_ITEM_SPACING = -4,
+	B_USE_HALF_ITEM_INSETS = -4,
+	B_USE_WINDOW_INSETS = -5,
+	B_USE_WINDOW_SPACING = -5,
+	B_USE_SMALL_INSETS = -6,
+	B_USE_SMALL_SPACING = -6,
+	B_USE_BIG_INSETS = -7,
+	B_USE_BIG_SPACING = -7
 };
 
 
diff --git a/src/kits/interface/ControlLook.cpp b/src/kits/interface/ControlLook.cpp
index 9ab89514f4..3f01f5cc2e 100644
--- a/src/kits/interface/ControlLook.cpp
+++ b/src/kits/interface/ControlLook.cpp
@@ -53,8 +53,7 @@ BControlLook::DefaultItemSpacing() const
 float
 BControlLook::ComposeSpacing(float spacing)
 {
-	// We only need to check one of each synonym (B_*_SPACING | B_*_INSETS)
-	if (spacing == B_USE_ITEM_SPACING) {
+	if (spacing == B_USE_DEFAULT_SPACING || spacing == B_USE_ITEM_SPACING) {
 		return be_control_look->DefaultItemSpacing();
 	} else if (spacing == B_USE_HALF_ITEM_SPACING) {
 		return be_control_look->DefaultItemSpacing() * 0.5f;