diff --git a/CHANGELIST.md b/CHANGELIST.md
index b855be58..a4700534 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -25,6 +25,7 @@
 - Add missing continue statement
 - Add newlines for mutliline special fields
 - Omit volume label for "Audio CD"
+- Remove Enter/Escape registration on disc info window
 
 ### 2.2 (2021-12-30)
 - Fix Saturn header finding
diff --git a/MPF/Windows/DiscInformationWindow.xaml b/MPF/Windows/DiscInformationWindow.xaml
index 7ad11663..abec7df8 100644
--- a/MPF/Windows/DiscInformationWindow.xaml
+++ b/MPF/Windows/DiscInformationWindow.xaml
@@ -299,9 +299,9 @@
             <!-- Accept / Cancel -->
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                 <UniformGrid Columns="3" Margin="5,5,5,5" Height="28">
-                    <Button Name="AcceptButton" Height="25" Width="80" IsDefault="True" Content="Accept"
+                    <Button Name="AcceptButton" Height="25" Width="80" Content="Accept"
                             Style="{DynamicResource CustomButtonStyle}" />
-                    <Button Name="CancelButton" Height="25" Width="80" IsCancel="True" Content="Cancel"
+                    <Button Name="CancelButton" Height="25" Width="80" Content="Cancel"
                             Style="{DynamicResource CustomButtonStyle}" />
                     <Button Name="RingCodeGuideButton" Grid.Column="2" Height="25" Width="120" Content="Ring Code Guide"
                             Style="{DynamicResource CustomButtonStyle}" />