diff --git a/src/Gallifrey.UI.Modern/ChangeLog.xml b/src/Gallifrey.UI.Modern/ChangeLog.xml
index f9d4844b..4dca42f7 100644
--- a/src/Gallifrey.UI.Modern/ChangeLog.xml
+++ b/src/Gallifrey.UI.Modern/ChangeLog.xml
@@ -373,6 +373,7 @@
     </Features>
     <Bugs>
       <Bug>Fix font issues in settings</Bug>
+      <Bug>Fix shortcut keys for right buttons</Bug>
       <Bug>Fix window resize on flyout opening</Bug>
     </Bugs>
     <Others/>
diff --git a/src/Gallifrey.UI.Modern/MainViews/ControlButtons.xaml b/src/Gallifrey.UI.Modern/MainViews/ControlButtons.xaml
index 8af76a12..64074146 100644
--- a/src/Gallifrey.UI.Modern/MainViews/ControlButtons.xaml
+++ b/src/Gallifrey.UI.Modern/MainViews/ControlButtons.xaml
@@ -81,7 +81,7 @@
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="InfoButton">
                 <Button.ToolTip>
                     <TextBlock>
-                        Application Information<LineBreak/>ALT + F1
+                        Application Information<LineBreak/>CTRL + F1
                     </TextBlock>
                 </Button.ToolTip>
                 <iconPacks:PackIconMaterial Kind="InformationVariant" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
@@ -89,7 +89,7 @@
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="TwitterButton">
                 <Button.ToolTip>
                     <TextBlock>
-                        Contact Us On Twitter<LineBreak/>ALT + F2
+                        Contact Us On Twitter<LineBreak/>CTRL + F2
                     </TextBlock>
                 </Button.ToolTip>
                 <iconPacks:PackIconMaterial Kind="Twitter" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
@@ -97,7 +97,7 @@
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="EmailButton">
                 <Button.ToolTip>
                     <TextBlock>
-                        Contact Us By Email<LineBreak/>ALT + F3
+                        Contact Us By Email<LineBreak/>CTRL + F3
                     </TextBlock>
                 </Button.ToolTip>
                 <iconPacks:PackIconMaterial Kind="At" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
@@ -105,7 +105,7 @@
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="GitterButton">
                 <Button.ToolTip>
                     <TextBlock>
-                        Chat With Users Or Ask For Help On Gitter<LineBreak/>ALT + F4
+                        Chat With Users Or Ask For Help On Gitter<LineBreak/>CTRL + F4
                     </TextBlock>
                 </Button.ToolTip>
                 <iconPacks:PackIconMaterial Kind="Message" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
@@ -113,7 +113,7 @@
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="GitHubButton">
                 <Button.ToolTip>
                     <TextBlock>
-                        View The Code On GitHub<LineBreak/>ALT + F5
+                        View The Code On GitHub<LineBreak/>CTRL + F5
                     </TextBlock>
                 </Button.ToolTip>
                 <iconPacks:PackIconMaterial Kind="GithubCircle" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
@@ -121,7 +121,7 @@
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="PayPalButton">
                 <Button.ToolTip>
                     <TextBlock>
-                       Donate By PayPal<LineBreak/>ALT + F6
+                       Donate By PayPal<LineBreak/>CTRL + F6
                     </TextBlock>
                 </Button.ToolTip>
                 <iconPacks:PackIconMaterial Kind="Paypal" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
diff --git a/src/Gallifrey.UI.Modern/MainViews/MainWindow.xaml.cs b/src/Gallifrey.UI.Modern/MainViews/MainWindow.xaml.cs
index 854620d2..0517d19f 100644
--- a/src/Gallifrey.UI.Modern/MainViews/MainWindow.xaml.cs
+++ b/src/Gallifrey.UI.Modern/MainViews/MainWindow.xaml.cs
@@ -635,13 +635,6 @@ private void MainWindow_KeyDown(object sender, KeyEventArgs e)
                     case Key.B: trigger = RemoteButtonTrigger.Save; break;
                     case Key.C: trigger = RemoteButtonTrigger.Copy; break;
                     case Key.V: trigger = RemoteButtonTrigger.Paste; break;
-                    default: return;
-                }
-            }
-            else if (Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt))
-            {
-                switch (key)
-                {
                     case Key.F1: trigger = RemoteButtonTrigger.Info; break;
                     case Key.F2: trigger = RemoteButtonTrigger.Twitter; break;
                     case Key.F3: trigger = RemoteButtonTrigger.Email; break;