diff --git a/Text-Grab/Controls/InlineChipElement.cs b/Text-Grab/Controls/InlineChipElement.cs
index da12f279..beab9d6b 100644
--- a/Text-Grab/Controls/InlineChipElement.cs
+++ b/Text-Grab/Controls/InlineChipElement.cs
@@ -31,6 +31,8 @@ public string Value
 
     public event EventHandler? RemoveRequested;
 
+    private Button? _removeButton;
+
     static InlineChipElement()
     {
         DefaultStyleKeyProperty.OverrideMetadata(
@@ -42,7 +44,15 @@ public override void OnApplyTemplate()
     {
         base.OnApplyTemplate();
 
-        if (GetTemplateChild(PartRemoveButton) is Button removeButton)
-            removeButton.Click += (s, e) => RemoveRequested?.Invoke(this, EventArgs.Empty);
+        if (_removeButton is not null)
+            _removeButton.Click -= RemoveButton_Click;
+
+        _removeButton = GetTemplateChild(PartRemoveButton) as Button;
+
+        if (_removeButton is not null)
+            _removeButton.Click += RemoveButton_Click;
     }
+
+    private void RemoveButton_Click(object sender, RoutedEventArgs e)
+        => RemoveRequested?.Invoke(this, EventArgs.Empty);
 }
diff --git a/Text-Grab/Controls/InlinePickerRichTextBox.cs b/Text-Grab/Controls/InlinePickerRichTextBox.cs
index a3c34dbe..0957745d 100644
--- a/Text-Grab/Controls/InlinePickerRichTextBox.cs
+++ b/Text-Grab/Controls/InlinePickerRichTextBox.cs
@@ -50,7 +50,7 @@ public class InlinePickerRichTextBox : RichTextBox
 
     public IEnumerable<InlinePickerItem> ItemsSource
     {
-        get => (IEnumerable<InlinePickerItem>)GetValue(ItemsSourceProperty);
+        get => (IEnumerable<InlinePickerItem>?)GetValue(ItemsSourceProperty) ?? [];
         set => SetValue(ItemsSourceProperty, value);
     }
 
diff --git a/Text-Grab/Views/FullscreenGrab.xaml b/Text-Grab/Views/FullscreenGrab.xaml
index 90717c49..35902a56 100644
--- a/Text-Grab/Views/FullscreenGrab.xaml
+++ b/Text-Grab/Views/FullscreenGrab.xaml
@@ -95,7 +95,7 @@
                             x:Name="FreeformSelectionMenuItem"
                             Click="SelectionStyleMenuItem_Click"
                             Header="Freeform - Draw any shape"
-                            InputGestureText="P"
+                            InputGestureText="D"
                             IsCheckable="True"
                             Tag="Freeform" />
                         <MenuItem
diff --git a/Text-Grab/Views/FullscreenGrab.xaml.cs b/Text-Grab/Views/FullscreenGrab.xaml.cs
index fd60f535..78ffa652 100644
--- a/Text-Grab/Views/FullscreenGrab.xaml.cs
+++ b/Text-Grab/Views/FullscreenGrab.xaml.cs
@@ -428,7 +428,7 @@ private void AddPostGrabActionMenuItem(ContextMenu contextMenu, ButtonInfo actio
             Tag = action,
             IsChecked = isChecked,
             StaysOpenOnClick = stayOpen,
-            InputGestureText = $"Ctrl+{shortcutIndex}"
+            InputGestureText = shortcutIndex <= 9 ? $"Ctrl+{shortcutIndex}" : string.Empty
         };
 
         menuItem.Click += PostActionMenuItem_Click;
diff --git a/Text-Grab/Views/QuickSimpleLookup.xaml.cs b/Text-Grab/Views/QuickSimpleLookup.xaml.cs
index 09a8ed18..936e83f2 100644
--- a/Text-Grab/Views/QuickSimpleLookup.xaml.cs
+++ b/Text-Grab/Views/QuickSimpleLookup.xaml.cs
@@ -732,6 +732,7 @@ private async Task LoadDataGridContent(string csvToOpenPath)
             PopulateSampleData();
 
         MainDataGrid.ItemsSource = null;
+        ItemsDictionary.Clear();
 
         ItemsDictionary.AddRange(ParseStringToRows(contentToParse, true));
         lookupItems = [.. ItemsDictionary];