diff --git a/src/kits/interface/OptionPopUp.cpp b/src/kits/interface/OptionPopUp.cpp
index 0dd58740e5..8949aa4bc3 100644
--- a/src/kits/interface/OptionPopUp.cpp
+++ b/src/kits/interface/OptionPopUp.cpp
@@ -193,7 +193,9 @@ BOptionPopUp::AllAttached()
 	BMenu* menu = fMenuField->Menu();
 	if (menu != NULL) {
 		float labelWidth = fMenuField->StringWidth(fMenuField->Label());
-		fMenuField->SetDivider(labelWidth + kLabelSpace);
+		if (labelWidth > 0.f)
+			labelWidth += kLabelSapce;
+		fMenuField->SetDivider(labelWidth);
 		menu->SetTargetForItems(this);
 	}
 }