diff --git a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
index e9f6670c..2216040d 100644
--- a/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
+++ b/MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
@@ -82,6 +82,7 @@ import Foundation
     public func highlightTab(at index: Int) {
         MVMCoreDispatchUtility.performBlock(onMainThread: {
             guard let newSelectedItem = self.items?[index] else { return }
+            self.model.selectedTab = index
             self.selectedItem = newSelectedItem
         })
     }
@@ -89,6 +90,7 @@ import Foundation
     public func selectTab(at index: Int) {
         MVMCoreDispatchUtility.performBlock(onMainThread: {
             guard let newSelectedItem = self.items?[index] else { return }
+            self.model.selectedTab = index
             self.selectedItem = newSelectedItem
             self.tabBar(self, didSelect: newSelectedItem)
         })