diff --git a/GalaxyBudsClient/Interface/Pages/AdvancedPage.xaml b/GalaxyBudsClient/Interface/Pages/AdvancedPage.xaml
index 59cf8c483..fc9de8fbf 100644
--- a/GalaxyBudsClient/Interface/Pages/AdvancedPage.xaml
+++ b/GalaxyBudsClient/Interface/Pages/AdvancedPage.xaml
@@ -55,7 +55,7 @@
                 </Border>
             </Grid>
         </Border>
-        <Border Grid.Row="4" x:Name="Hotkeys" Classes="RoundedBorderListItem BottomSpacer10">
+        <Border Grid.Row="4" x:Name="HotkeysBixby" Classes="RoundedBorderListItem BottomSpacer10">
             <Grid ClipToBounds="True">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="*" />
@@ -65,7 +65,7 @@
                 
                 <items:DetailListItem Grid.Row="0" Text="{DynamicResource adv_hotkey}"
                                       Description="{DynamicResource adv_hotkey_desc}"
-                                      PointerPressed="Hotkeys_OnPointerPressed"/>
+                                      PointerPressed="Hotkeys_OnPointerPressed" x:Name="Hotkeys" />
                 <Separator Grid.Row="1" x:Name="BixbyRemapS"  Margin="20,0,20,0" Background="{DynamicResource BorderSeparatorBrush}" />
                 <Border Grid.Row="2" x:Name="BixbyRemap">
                     <items:DetailListItem Text="{DynamicResource adv_bixby_remap}"
diff --git a/GalaxyBudsClient/Interface/Pages/AdvancedPage.xaml.cs b/GalaxyBudsClient/Interface/Pages/AdvancedPage.xaml.cs
index d6127bdf0..8a4d2adc5 100644
--- a/GalaxyBudsClient/Interface/Pages/AdvancedPage.xaml.cs
+++ b/GalaxyBudsClient/Interface/Pages/AdvancedPage.xaml.cs
@@ -44,9 +44,12 @@ private void InstanceOnExtendedStatusUpdate(object? sender, ExtendedStatusUpdate
 
 		public override void OnPageShown()
 		{
-			this.FindControl<Border>("Hotkeys").IsVisible = PlatformUtils.SupportsHotkeys;
+			this.FindControl<Border>("HotkeysBixby").IsVisible =
+					PlatformUtils.SupportsHotkeys || BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.BixbyWakeup);
+			this.FindControl<Separator>("BixbyRemapS").IsVisible =
+				PlatformUtils.SupportsHotkeys && BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.BixbyWakeup);
+			this.FindControl<DetailListItem>("Hotkeys").IsVisible = PlatformUtils.SupportsHotkeys;
 			this.FindControl<Border>("BixbyRemap").IsVisible = BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.BixbyWakeup);
-			this.FindControl<Separator>("BixbyRemapS").IsVisible = BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.BixbyWakeup);
 			this.FindControl<Separator>("SidetoneS").IsVisible = BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.AmbientSidetone);
 			this.FindControl<Separator>("PassthroughS").IsVisible = BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.AmbientPassthrough);
 			_sidetone.Parent!.IsVisible = BluetoothImpl.Instance.DeviceSpec.Supports(IDeviceSpec.Feature.AmbientSidetone);