diff --git a/ChangeLog b/ChangeLog
index 74cc1f555..d7d3d7672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-17 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSToolbarItem.m (-setView:): Only set the min/max size of
+	the toolbar item when it was zero.
+
 2010-05-17 04:36-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/NSApplication.m: Attempt to open files from the command
diff --git a/Source/NSToolbarItem.m b/Source/NSToolbarItem.m
index f2002780f..7de53530c 100644
--- a/Source/NSToolbarItem.m
+++ b/Source/NSToolbarItem.m
@@ -1386,8 +1386,10 @@ NSString *GSMovableToolbarItemPboardType = @"GSMovableToolbarItemPboardType";
       NSSize size;
 
       size = [view frame].size;
-      [self setMinSize: size];
-      [self setMaxSize: size];
+      if (NSEqualSizes(NSZeroSize, _minSize))
+          [self setMinSize: size];
+      if (NSEqualSizes(NSZeroSize, _maxSize))
+          [self setMaxSize: size];
 
       [_view setToolTip: _toolTip];