diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift
index f0d93237..17da8897 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift
@@ -23,14 +23,13 @@ import VDS
     open var viewModel: TabsModel!
     open var delegateObject: MVMCoreUIDelegateObject?
     open var additionalData: [AnyHashable : Any]?
-    
+        
     //delegate
     weak public var delegate: TabsDelegate? { 
         didSet {
             if let delegate {
                 onTabDidSelect = { [weak self] index in
                     guard let self else { return }
-                    viewModel.selectedIndex = index
                     delegate.didSelectItem(.init(row: index, section: 0), tabs: self)
                 }
                 
@@ -41,7 +40,17 @@ import VDS
             }
         }
     }
-        
+       
+    //--------------------------------------------------
+    // MARK: - Public Properties Overrides
+    //--------------------------------------------------
+    open override var selectedIndex: Int {
+        didSet {
+            guard let viewModel else { return }
+            viewModel.selectedIndex = selectedIndex
+        }
+    }
+
     //-------------------------------------------------
     // MARK: - Layout Views
     //-------------------------------------------------