diff --git a/AppKit/CPTokenField.j b/AppKit/CPTokenField.j
index 61ed7d3dd..c69d481ca 100644
--- a/AppKit/CPTokenField.j
+++ b/AppKit/CPTokenField.j
@@ -551,7 +551,7 @@ CPTokenFieldDeleteButtonType     = 1;
         CPTokenFieldCachedDragFunction = nil;
 
         document.body.ondrag = CPTokenFieldCachedDragFunction;
-        document.body.onselectstart = CPTokenFieldCachedSelectStartFunction
+        document.body.onselectstart = CPTokenFieldCachedSelectStartFunction;
     }
 
 #endif
diff --git a/AppKit/CPToolbar.j b/AppKit/CPToolbar.j
index c60276b64..0be382d0a 100644
--- a/AppKit/CPToolbar.j
+++ b/AppKit/CPToolbar.j
@@ -1021,6 +1021,22 @@ var LABEL_MARGIN    = 2.0;
     BOOL            _FIXME_isHUD;
 }
 
+- (BOOL)acceptsFirstResponder
+{
+    if (_view && [_view acceptsFirstResponder])
+        return YES;
+
+     return NO;
+}
+
+- (BOOL)becomeFirstResponder
+{
+    if (_view && [_view acceptsFirstResponder])
+        return [[self window] makeFirstResponder:_view];
+
+    return [super becomeFirstResponder];
+}
+
 - (id)initWithToolbarItem:(CPToolbarItem)aToolbarItem toolbar:(CPToolbar)aToolbar
 {
     self = [super init];