diff --git a/src/kits/interface/TabView.cpp b/src/kits/interface/TabView.cpp
index d55526a7a5..3d2e31c8cf 100644
--- a/src/kits/interface/TabView.cpp
+++ b/src/kits/interface/TabView.cpp
@@ -1159,6 +1159,9 @@ BTabView::RemoveTab(int32 index)
 
 	tab->Deselect();
 
+	if (fContainerView->GetLayout())
+		fContainerView->GetLayout()->RemoveItem(index);
+
 	if (index <= fSelection && fSelection != 0)
 		fSelection--;
 
@@ -1172,9 +1175,6 @@ BTabView::RemoveTab(int32 index)
 	else
 		SetFocusTab(fFocus, true);
 
-	if (fContainerView->GetLayout())
-		fContainerView->GetLayout()->RemoveItem(index);
-
 	return tab;
 }