diff --git a/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml b/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml
index c8188a2e8e..a5101affe1 100644
--- a/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml
+++ b/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml
@@ -77,6 +77,7 @@
                         BorderThickness="0,1,0,0"
                         Click="OnSettingsCardClick"
                         CornerRadius="0"
+                        Tag="{x:Bind}"
                         IsClickEnabled="{Binding (tk:FrameworkElementExtensions.Ancestor).IsItemClickable, RelativeSource={RelativeSource Self}}">
                         <tkcontrols:SettingsCard.Header>
                             <StackPanel Orientation="Horizontal">
diff --git a/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml.cs b/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml.cs
index c72d51bb2b..f33cd64ec7 100644
--- a/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml.cs
+++ b/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml.cs
@@ -84,7 +84,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
 
         private void OnSettingsCardClick(object sender, RoutedEventArgs e)
         {
-            if (sender is FrameworkElement element && element.DataContext is ModuleListItem item)
+            if (sender is FrameworkElement element && element.Tag is ModuleListItem item)
             {
                 item.ClickCommand?.Execute(item.Tag);
             }