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 0260e18ecb..dcee0dda0b 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,8 +774,8 @@ void createItem (CTabItem item, int index) {
 	priority = newPriority;
 
 	if (items.length == 1) {
+		this.setSelection(0);
 		updateFolder(UPDATE_TAB_HEIGHT | REDRAW);
-		selectedIndex = selectedIndex + 1;
 	} else {
 		updateFolder(REDRAW_TABS);
 	}