diff --git a/src/App/Pages/Vault/VaultViewSitePage.cs b/src/App/Pages/Vault/VaultViewSitePage.cs
index 6abde9975..151b1bb36 100644
--- a/src/App/Pages/Vault/VaultViewSitePage.cs
+++ b/src/App/Pages/Vault/VaultViewSitePage.cs
@@ -15,6 +15,7 @@ namespace Bit.App.Pages
         private readonly ISiteService _siteService;
         private readonly IUserDialogs _userDialogs;
         private readonly IClipboardService _clipboardService;
+        private readonly IDeviceInfoService _deviceInfo;
 
         public VaultViewSitePage(string siteId)
         {
@@ -22,6 +23,7 @@ namespace Bit.App.Pages
             _siteService = Resolver.Resolve<ISiteService>();
             _userDialogs = Resolver.Resolve<IUserDialogs>();
             _clipboardService = Resolver.Resolve<IClipboardService>();
+            _deviceInfo = Resolver.Resolve<IDeviceInfoService>();
 
             Init();
         }
@@ -107,10 +109,11 @@ namespace Bit.App.Pages
             }
             else if(Device.OS == TargetPlatform.Android)
             {
+                // NOTE: This is going to cause problems with i18n strings since various languages have difference string sizes
                 PasswordCell.Button1.WidthRequest = 40;
                 PasswordCell.Button2.WidthRequest = 55;
                 UsernameCell.Button1.WidthRequest = 55;
-                UriCell.Button1.WidthRequest = 71;
+                UriCell.Button1.WidthRequest = _deviceInfo.Version < 21 ? 75 : 71;
             }
 
             Title = AppResources.ViewSite;