diff --git a/Source/NSTabView.m b/Source/NSTabView.m
index 474f37dcb..079381c81 100644
--- a/Source/NSTabView.m
+++ b/Source/NSTabView.m
@@ -198,7 +198,7 @@
       if ([_selected view])
 	{
 	  [self addSubview: [_selected view]];
-	  [[_selected initialFirstResponder] becomeFirstResponder];
+	  [_window makeFirstResponder: [_selected initialFirstResponder]];
 	}
 
       [self setNeedsDisplay: YES];