diff --git a/src/kits/interface/TabView.cpp b/src/kits/interface/TabView.cpp
index a7a09a4407..098b9b18d7 100644
--- a/src/kits/interface/TabView.cpp
+++ b/src/kits/interface/TabView.cpp
@@ -1128,11 +1128,15 @@ BTabView::AddTab(BView *target, BTab *tab)
 		tab = new BTab(target);
 	else
 		tab->SetView(target);
-	
+
 	if (fContainerView->GetLayout())
 		fContainerView->GetLayout()->AddView(CountTabs(), target);
 
 	fTabList->AddItem(tab);
+
+	// When we don't have a any tabs yet, select this one.
+	if (CountTabs() == 1)
+		Select(0);
 }