diff --git a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
index 449dff99..741fb830 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 = tabsWrapper.pinTrailingGreaterThanOrEqualTo(anchor: tabs.trailingAnchor)?.activate()
+        tabsTrailingConstraint = tabsWrapper.pinTrailing(anchor: tabs.trailingAnchor)?.activate()
         return tabsWrapper
     }()
     
@@ -152,7 +152,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
     }
     /// ensures margin for tabs are correct
     private func updateTabsMargin() {
-        let tabsGutterSpacing = isFillContainer ? 0 : Padding.Component.horizontalPaddingForSize(stackView.bounds.width)
+        let tabsGutterSpacing = isFillContainer ? 0 : Padding.Component.horizontalPaddingForSize(view.bounds.size.width)
         tabsLeadingConstraint?.constant = tabsGutterSpacing
         tabsTrailingConstraint?.constant = tabsGutterSpacing
     }