diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
index d1acaab705..3978f2216b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java	
@@ -774,6 +774,7 @@ void createItem (CTabItem item, int index) {
 	priority = newPriority;
 
 	if (items.length == 1) {
+		setSelection(0);
 		updateFolder(UPDATE_TAB_HEIGHT | REDRAW);
 	} else {
 		updateFolder(REDRAW_TABS);