diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
index 29555d1..29e8d0f 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml
@@ -133,6 +133,7 @@
                   Background="{DynamicResource BackgroundDarkBrush}"
                   BorderThickness="0"
                   Sorting="ResultsGrid_Sorting"
+                  DoubleTapped="ResultsGrid_DoubleTapped"
                   ScrollViewer.HorizontalScrollBarVisibility="Auto">
             <DataGrid.ContextMenu>
                 <ContextMenu Opening="ContextMenu_Opening">
diff --git a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
index edbd75b..bb30ea2 100644
--- a/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QueryStoreGridControl.axaml.cs
@@ -5,9 +5,12 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.VisualTree;
 using Avalonia.Media;
 using PlanViewer.Core.Interfaces;
 using PlanViewer.Core.Models;
@@ -758,6 +761,21 @@ private void ExpandRow_Click(object? sender, RoutedEventArgs e)
     {
         if (sender is not Button btn) return;
         if (btn.DataContext is not QueryStoreRow row) return;
+        ToggleRowExpansion(row);
+    }
+
+    private void ResultsGrid_DoubleTapped(object? sender, TappedEventArgs e)
+    {
+        if (e.Source is not Visual v) return;
+        if (v.FindAncestorOfType<Button>() != null) return;
+        if (v.FindAncestorOfType<DataGridRow>() == null) return;
+        if (ResultsGrid.SelectedItem is not QueryStoreRow row) return;
+        if (!row.HasChildren) return;
+        ToggleRowExpansion(row);
+    }
+
+    private void ToggleRowExpansion(QueryStoreRow row)
+    {
         if (!row.HasChildren) return;
 
         row.IsExpanded = !row.IsExpanded;
diff --git a/src/PlanViewer.App/MainWindow.axaml.cs b/src/PlanViewer.App/MainWindow.axaml.cs
index fa4f4b4..2d50fdb 100644
--- a/src/PlanViewer.App/MainWindow.axaml.cs
+++ b/src/PlanViewer.App/MainWindow.axaml.cs
@@ -92,6 +92,23 @@ public MainWindow()
                             e.Handled = true;
                         }
                         break;
+                    case Key.Tab:
+                        var tabCount = MainTabControl.Items.Count;
+                        if (tabCount > 1)
+                        {
+                            MainTabControl.SelectedIndex = (MainTabControl.SelectedIndex + 1) % tabCount;
+                            e.Handled = true;
+                        }
+                        break;
+                }
+            }
+            else if (e.KeyModifiers == (KeyModifiers.Control | KeyModifiers.Shift) && e.Key == Key.Tab)
+            {
+                var tabCount = MainTabControl.Items.Count;
+                if (tabCount > 1)
+                {
+                    MainTabControl.SelectedIndex = (MainTabControl.SelectedIndex - 1 + tabCount) % tabCount;
+                    e.Handled = true;
                 }
             }
         }, RoutingStrategies.Tunnel);
@@ -824,6 +841,7 @@ private TabItem CreateTab(string label, Control content)
         var header = new StackPanel
         {
             Orientation = Orientation.Horizontal,
+            Background = Brushes.Transparent,
             Children = { headerText, closeBtn }
         };
 
@@ -831,6 +849,16 @@ private TabItem CreateTab(string label, Control content)
         closeBtn.Tag = tab;
         closeBtn.Click += CloseTab_Click;
 
+        header.PointerPressed += (_, e) =>
+        {
+            if (e.GetCurrentPoint(null).Properties.PointerUpdateKind == PointerUpdateKind.MiddleButtonPressed)
+            {
+                MainTabControl.Items.Remove(tab);
+                UpdateEmptyOverlay();
+                e.Handled = true;
+            }
+        };
+
         // Right-click context menu
         var copyPathItem = new MenuItem { Header = "Copy Path", Tag = tab };
         // Only visible when tab content has a file path