343389 - AIOOBE thrown when destroying the non-zeroth item when tabs are obscured
diff --git a/bundles/org.eclipse.e4.ui.widgets/src/org/eclipse/e4/ui/widgets/CTabFolder.java b/bundles/org.eclipse.e4.ui.widgets/src/org/eclipse/e4/ui/widgets/CTabFolder.java
index d3e3ad6..151ff82 100644
--- a/bundles/org.eclipse.e4.ui.widgets/src/org/eclipse/e4/ui/widgets/CTabFolder.java
+++ b/bundles/org.eclipse.e4.ui.widgets/src/org/eclipse/e4/ui/widgets/CTabFolder.java
@@ -594,7 +594,7 @@
 		while (i < priority.length && items[priority[i]].showing) {
 			lastIndex = Math.max(lastIndex, priority[i++]);
 		}
-		if (lastIndex == -1) lastIndex = firstIndex;
+		if (lastIndex == -1) lastIndex = selectedIndex;
 		if (lastIndex != -1) {
 			CTabItem lastItem = items[lastIndex];
 			int w = lastItem.x + lastItem.width + SPACING;