diff --git a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
index 9bf81fa8..449dff99 100644
--- a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
+++ b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
@@ -42,7 +42,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
         tabs.pinTop()
         tabs.pinBottom()
         tabsLeadingConstraint = tabs.pinLeading(anchor: tabsWrapper.leadingAnchor)?.activate()
-        tabsTrailingConstraint = tabs.pinTrailingLessThanOrEqualTo(anchor: tabsWrapper.trailingAnchor)?.activate()
+        tabsTrailingConstraint = tabsWrapper.pinTrailingGreaterThanOrEqualTo(anchor: tabs.trailingAnchor)?.activate()
         return tabsWrapper
     }()
     
@@ -154,7 +154,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
     private func updateTabsMargin() {
         let tabsGutterSpacing = isFillContainer ? 0 : Padding.Component.horizontalPaddingForSize(stackView.bounds.width)
         tabsLeadingConstraint?.constant = tabsGutterSpacing
-        tabsTrailingConstraint?.constant = -tabsGutterSpacing
+        tabsTrailingConstraint?.constant = tabsGutterSpacing
     }
     
     /// Hides/Shows the navigation bar for the page.
@@ -173,6 +173,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
     open override func updateViews() {
         super.updateViews()
         if screenSizeChanged() {
+            tabs.updateView(view.bounds.size.width)
             updateTabsMargin()
         }
     }