diff --git a/magit.el b/magit.el
index 03dd3a48..2d3f4854 100644
--- a/magit.el
+++ b/magit.el
@@ -1440,7 +1440,7 @@ FUNC should leave point at the end of the modified region"
 (defun magit-menu-insert-item (text highlight-p)
   (let* ((item-width 35)
 	 (max-items-perline 2)
-	 (max-columns (* max-items-perline item-width))
+	 (max-columns (window-width))
 	 (begin)
 	 (current-column (- (point) (line-beginning-position)))
 	 (padding