diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
index affbc470..487a7b51 100644
--- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
+++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
@@ -197,7 +197,13 @@ static const CGFloat VertialShadowOffset = 6;
             [view.rightAnchor constraintEqualToAnchor:button.rightAnchor constant:PaddingTwo].active = YES;
             [view.centerYAnchor constraintEqualToAnchor:button.centerYAnchor].active = YES;
         } else {
-            [NSLayoutConstraint constraintPinSubview:button pinTop:YES topConstant:PaddingOne pinBottom:NO bottomConstant:0 pinLeft:NO leftConstant:0 pinRight:YES rightConstant:PaddingTwo];
+            if (@available(iOS 11.0, *)) {
+                [button.topAnchor constraintEqualToAnchor:view.safeAreaLayoutGuide.topAnchor constant:PaddingOne].active = YES;
+                [view.safeAreaLayoutGuide.trailingAnchor constraintEqualToAnchor:button.trailingAnchor constant:PaddingTwo].active = YES;
+            } else {
+                [NSLayoutConstraint constraintPinSubview:button pinTop:YES topConstant:PaddingOne pinBottom:NO bottomConstant:0 pinLeft:NO leftConstant:0 pinRight:YES rightConstant:PaddingTwo];
+            }
+            
         }
     }
     return button;