diff --git a/AppKit/CPToolbar.j b/AppKit/CPToolbar.j
index 0917ce948..2d103155c 100644
--- a/AppKit/CPToolbar.j
+++ b/AppKit/CPToolbar.j
@@ -896,7 +896,7 @@ var TOP_MARGIN      = 5.0,
 
         _toolbar = aToolbar;
 
-        var keyPaths = [@"label", @"image", @"alternateImage", @"minSize", @"maxSize", @"enabled"],
+        var keyPaths = [@"label", @"image", @"alternateImage", @"minSize", @"maxSize", @"target", @"action", @"enabled"],
             index = 0,
             count = [keyPaths count];
 
@@ -1102,6 +1102,13 @@ var TOP_MARGIN      = 5.0,
 {
     if (aKeyPath === "enabled")
         [self setEnabled:[anObject isEnabled]];
+
+    else if (aKeyPath === @"target")
+        [self setTarget:[anObject target]];
+
+    else if (aKeyPath === @"action")
+        [self setAction:[anObject action]];
+
     else
         [self updateFromItem];
 }
diff --git a/AppKit/CPToolbarItem.j b/AppKit/CPToolbarItem.j
index 54e93c6b0..4d90f2d37 100644
--- a/AppKit/CPToolbarItem.j
+++ b/AppKit/CPToolbarItem.j
@@ -548,7 +548,7 @@ var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
 
         [self setTag:[aCoder decodeObjectForKey:CPToolbarItemTagKey]];
         [self setTarget:[aCoder decodeObjectForKey:CPToolbarItemTargetKey]];
-        [self setAction:[aCoder decodeObjectForKey:CPToolbarItemActionKey]];
+        [self setAction:CPSelectorFromString([aCoder decodeObjectForKey:CPToolbarItemActionKey])];
 
         [self setEnabled:[aCoder decodeBoolForKey:CPToolbarItemEnabledKey]];
 
diff --git a/Tools/nib2cib/NSToolbarItem.j b/Tools/nib2cib/NSToolbarItem.j
index 76ab09665..bc5143d30 100644
--- a/Tools/nib2cib/NSToolbarItem.j
+++ b/Tools/nib2cib/NSToolbarItem.j
@@ -57,7 +57,6 @@ NS_CPToolbarItemIdentifierMap =
         [self setTag:[aCoder decodeObjectForKey:@"NSToolbarItemTag"]];
         [self setTarget:[aCoder decodeObjectForKey:@"NSToolbarItemTarget"]];
         [self setAction:CPSelectorFromString([aCoder decodeObjectForKey:@"NSToolbarItemAction"])];
-
         [self setEnabled:[aCoder decodeBoolForKey:@"NSToolbarItemEnabled"]];
 
         [self setImage:[aCoder decodeBoolForKey:@"NSToolbarItemImage"]];