diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml b/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml
index 900e4d666..c02ad3d60 100644
--- a/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml
+++ b/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml
@@ -24,7 +24,8 @@
                   Margin="10 2"
                   ItemsSource="{CompiledBinding SidebarScreen.Screens}"
                   SelectedItem="{CompiledBinding SelectedScreen}"
-                  ItemContainerTheme="{StaticResource MenuTreeViewItem}">
+                  ItemContainerTheme="{StaticResource MenuTreeViewItem}"
+                  PointerReleased="InputElement_OnPointerReleased">
             <TreeView.Styles>
                 <Style Selector="TreeViewItem">
                     <Setter Property="IsExpanded" Value="{CompiledBinding IsExpanded, Mode=TwoWay, DataType=sidebar:SidebarScreenViewModel}" />
diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml.cs b/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml.cs
index 9eea2e7f2..ab6b2ea40 100644
--- a/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml.cs
+++ b/src/Artemis.UI/Screens/Sidebar/SidebarView.axaml.cs
@@ -1,4 +1,7 @@
-using Avalonia.Markup.Xaml;
+using System;
+using Avalonia;
+using Avalonia.Input;
+using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 
 namespace Artemis.UI.Screens.Sidebar;
@@ -10,4 +13,9 @@ public partial class SidebarView : ReactiveUserControl<SidebarViewModel>
         InitializeComponent();
     }
 
+    private void InputElement_OnPointerReleased(object? sender, PointerReleasedEventArgs e)
+    {
+        if (e.Source is IDataContextProvider dataContextProvider && dataContextProvider.DataContext is SidebarScreenViewModel sidebarScreenViewModel)
+            ViewModel?.NavigateToScreen(sidebarScreenViewModel);
+    }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs b/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs
index b8ad5aede..25cb7575b 100644
--- a/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs
+++ b/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs
@@ -52,7 +52,6 @@ public class SidebarViewModel : ActivatableViewModelBase
         });
 
         AddCategory = ReactiveCommand.CreateFromTask(ExecuteAddCategory);
-        this.WhenAnyValue(vm => vm.SelectedScreen).WhereNotNull().Subscribe(NavigateToScreen);
         this.WhenAnyValue(vm => vm.SelectedScreen).WhereNotNull().Subscribe(s => SidebarScreen.ExpandIfRequired(s));
 
         SourceList<ProfileCategory> profileCategories = new();
@@ -119,7 +118,7 @@ public class SidebarViewModel : ActivatableViewModelBase
             .ShowAsync();
     }
 
-    private void NavigateToScreen(SidebarScreenViewModel sidebarScreenViewModel)
+    public void NavigateToScreen(SidebarScreenViewModel sidebarScreenViewModel)
     {
         if (_updating)
             return;