From 9c700d9a437df0d136ea8a855e1c093020626877 Mon Sep 17 00:00:00 2001
From: Maiko <maikotattun@yahoo.co.jp>
Date: Sun, 11 Jan 2026 19:59:27 +0900
Subject: [PATCH 1/2] Fix mishandled key event

---
 OpenUtau/Views/PianoRollWindow.axaml.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/OpenUtau/Views/PianoRollWindow.axaml.cs b/OpenUtau/Views/PianoRollWindow.axaml.cs
index b75a4af4b..1bd18c5ad 100644
--- a/OpenUtau/Views/PianoRollWindow.axaml.cs
+++ b/OpenUtau/Views/PianoRollWindow.axaml.cs
@@ -1295,7 +1295,7 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                     break;
                 case Key.F11:
                     OnMenuFullScreen(this, new RoutedEventArgs());
-                    break;
+                    return true;
                 case Key.Enter:
                     if (isNone) {
                         if (notesVm.Selection.Count == 1) {
@@ -1455,6 +1455,7 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                     }
                     if (isAlt) {
                         SnapDivMenu.Open();
+                        return true;
                     }
                     break;
                 case Key.OemPipe:
@@ -1734,6 +1735,7 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                     // mute
                     if (isShift) {
                         MessageBus.Current.SendMessage(new TracksMuteEvent(notesVm.Part.trackNo, false));
+                        return true;
                     }
                     break;
                 case Key.F:
@@ -1792,13 +1794,15 @@ bool OnKeyExtendedHandler(KeyEventArgs args) {
                 #region move to the next track part
                 case Key.PageUp: {
                         if (isNone) {
-                            return MoveToNextPart(false);
+                            MoveToNextPart(false);
+                            return true;
                         }
                     }
                     break;
                     case Key.PageDown: {
                         if (isNone) {
-                            return MoveToNextPart(true);
+                            MoveToNextPart(true);
+                            return true;
                         }
                     }
                     break;

From 2dda697c579e2f3d4e80b32d892825fe38f0bd7e Mon Sep 17 00:00:00 2001
From: Maiko <maikotattun@yahoo.co.jp>
Date: Sun, 11 Jan 2026 20:43:09 +0900
Subject: [PATCH 2/2] Fix textbox focus in note properties panel

---
 OpenUtau/Controls/NotePropertiesControl.axaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenUtau/Controls/NotePropertiesControl.axaml b/OpenUtau/Controls/NotePropertiesControl.axaml
index 2d1921a3c..1261aaa37 100644
--- a/OpenUtau/Controls/NotePropertiesControl.axaml
+++ b/OpenUtau/Controls/NotePropertiesControl.axaml
@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:OpenUtau.App.ViewModels"
              mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="600" Width="400"
-             x:Class="OpenUtau.App.Controls.NotePropertiesControl" KeyDown="OnKeyDown" Margin="0">
+             x:Class="OpenUtau.App.Controls.NotePropertiesControl"
+             KeyDown="OnKeyDown" Focusable="True">
   <UserControl.Styles>
     <Style Selector="Button,CheckBox">
       <Setter Property="Focusable" Value="False"/>