diff --git a/Source/Editor/GUI/Tabs/Tabs.cs b/Source/Editor/GUI/Tabs/Tabs.cs
index db7b4f5d5..598aae016 100644
--- a/Source/Editor/GUI/Tabs/Tabs.cs
+++ b/Source/Editor/GUI/Tabs/Tabs.cs
@@ -227,8 +227,8 @@ namespace FlaxEditor.GUI.Tabs
         /// </summary>
         public Tab SelectedTab
         {
-            get => _selectedIndex == -1 ? null : Children[_selectedIndex + 1] as Tab;
-            set => SelectedTabIndex = Children.IndexOf(value) - 1;
+            get => _selectedIndex == -1 && Children.Count > _selectedIndex + 1 ? null : Children[_selectedIndex + 1] as Tab;
+            set => SelectedTabIndex = value != null ? Children.IndexOf(value) - 1 : -1;
         }
 
         /// <summary>