diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp
index df14c5b00f..eb6ab778f2 100644
--- a/src/kits/interface/Menu.cpp
+++ b/src/kits/interface/Menu.cpp
@@ -1327,6 +1327,9 @@ BMenu::ComputeLayout(int32 index, bool bestFit, bool moveItems,
 					item->fBounds.bottom = item->fBounds.top + iHeight + fPad.top + fPad.bottom;
 
 					frame.right = max_c(frame.right, iWidth + fPad.left + fPad.right + 20);
+					if (fMaxContentWidth > 0)
+						frame.right = min_c(frame.right, fMaxContentWidth);
+
 					frame.bottom = item->fBounds.bottom + 1.0f;
 				}
 			}