diff --git a/src/Core/Controls/IconLabelButton/IconLabelButton.xaml b/src/Core/Controls/IconLabelButton/IconLabelButton.xaml
index 18d89eb64..507f3547c 100644
--- a/src/Core/Controls/IconLabelButton/IconLabelButton.xaml
+++ b/src/Core/Controls/IconLabelButton/IconLabelButton.xaml
@@ -11,13 +11,13 @@
             <RoundRectangle CornerRadius="{Binding CornerRadius, Source={x:Reference _iconLabelButton}}" />
         </Border.StrokeShape>
         <Grid>
+            <Grid.GestureRecognizers>
+                <TapGestureRecognizer Tapped="TapGestureRecognizer_OnTapped" Command="{Binding ButtonCommand, Source={x:Reference _iconLabelButton}}" />
+            </Grid.GestureRecognizers>
             <StackLayout
                 Spacing="6"
                 Orientation="Horizontal"
                 HorizontalOptions="Center">
-                <StackLayout.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding ButtonCommand, Source={x:Reference _iconLabelButton}}" />
-                </StackLayout.GestureRecognizers>
                 <controls:IconLabel
                     VerticalOptions="Center"
                     HorizontalTextAlignment="Center"
diff --git a/src/Core/Controls/IconLabelButton/IconLabelButton.xaml.cs b/src/Core/Controls/IconLabelButton/IconLabelButton.xaml.cs
index 23b306682..853a2d607 100644
--- a/src/Core/Controls/IconLabelButton/IconLabelButton.xaml.cs
+++ b/src/Core/Controls/IconLabelButton/IconLabelButton.xaml.cs
@@ -25,6 +25,8 @@ namespace Bit.App.Controls
         public static readonly BindableProperty CornerRadiusProperty = BindableProperty.Create(
             nameof(CornerRadius), typeof(CornerRadius), typeof(IconLabelButton));
 
+        public event EventHandler<TappedEventArgs> Tapped;
+
         public IconLabelButton()
         {
             InitializeComponent();
@@ -71,6 +73,11 @@ namespace Bit.App.Controls
             get { return (CornerRadius)GetValue(CornerRadiusProperty); }
             set { SetValue(CornerRadiusProperty, value); }
         }
+
+        private void TapGestureRecognizer_OnTapped(object sender, TappedEventArgs e)
+        {
+            Tapped?.Invoke(sender, e);
+        }
     }
 }
 
diff --git a/src/Core/Pages/Accounts/LoginPage.xaml b/src/Core/Pages/Accounts/LoginPage.xaml
index 2e500d5fa..eafaef3d0 100644
--- a/src/Core/Pages/Accounts/LoginPage.xaml
+++ b/src/Core/Pages/Accounts/LoginPage.xaml
@@ -128,11 +128,9 @@
                             VerticalOptions="CenterAndExpand"
                             Icon="{Binding Source={x:Static core:BitwardenIcons.Suitcase}}"
                             Label="{u:I18n LogInSso}"
-                            AutomationId="LogInWithSsoButton">
-                            <controls:IconLabelButton.GestureRecognizers>
-                                <TapGestureRecognizer Tapped="LogInSSO_Clicked" />
-                            </controls:IconLabelButton.GestureRecognizers>
-                        </controls:IconLabelButton>
+                            AutomationId="LogInWithSsoButton"
+                            Tapped="LogInSSO_Clicked"
+                            />
                         <Label
                             Text="{Binding LoggingInAsText}"
                             StyleClass="text-sm"