diff --git a/src/Client/ZB.MOM.WW.OtOpcUa.Client.UI/Views/ShelveAlarmWindow.axaml.cs b/src/Client/ZB.MOM.WW.OtOpcUa.Client.UI/Views/ShelveAlarmWindow.axaml.cs
index 07d98f08..8fe28063 100644
--- a/src/Client/ZB.MOM.WW.OtOpcUa.Client.UI/Views/ShelveAlarmWindow.axaml.cs
+++ b/src/Client/ZB.MOM.WW.OtOpcUa.Client.UI/Views/ShelveAlarmWindow.axaml.cs
@@ -46,8 +46,12 @@ public partial class ShelveAlarmWindow : Window
     {
         var durationPanel = this.FindControl<StackPanel>("DurationPanel");
         var kindCombo = this.FindControl<ComboBox>("KindCombo");
+        var shelveButton = this.FindControl<Button>("ShelveButton");
         if (durationPanel != null && kindCombo != null)
             durationPanel.IsEnabled = kindCombo.SelectedIndex == 1; // Timed
+        // Relabel the action button so selecting "Unshelve" doesn't read "Shelve".
+        if (shelveButton != null)
+            shelveButton.Content = kindCombo?.SelectedIndex == 2 ? "Unshelve" : "Shelve";
     }
 
     private async void OnShelveClicked(object? sender, RoutedEventArgs e)