diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
index e27a4e4..26e4e8b 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
@@ -176,6 +176,10 @@ public bool IsTreeViewMode
     private readonly ObservableAsPropertyHelper<IEnumerable<ScriptConfigGroupWrapper>> _filteredActionList;
     public IEnumerable<ScriptConfigGroupWrapper> FilteredActionList => _filteredActionList.Value;
 
+    private readonly ObservableAsPropertyHelper<int> _actionCount;
+    public int ActionCount => _actionCount.Value;
+
+
 
     
     public ObservableCollection<RunningJobViewModel> RunningJobs { get; set; } = new();
@@ -215,9 +219,13 @@ public object? SelectedActionOrGroup
         set
         {
             this.RaiseAndSetIfChanged(ref _selectedActionOrGroup, value);
-            if (value is TaggedScriptConfig {Config: var scriptConfig})
+            if (value is TaggedScriptConfig {Config: var scriptConfig, ArgumentSet: var argumentSet})
             {
                 SelectedAction = scriptConfig;
+                if (argumentSet != null)
+                {
+                    SelectedArgumentSet = argumentSet;
+                }
             }
         }
     }
@@ -393,12 +401,8 @@ public MainWindowViewModel(ParamsPanelFactory paramsPanelFactory, VaultProvider
             {
                 var (textFilter, categoryFilter, actions) = tuple;
                 
-                // Apply text filter
-                var configs = string.IsNullOrWhiteSpace(textFilter) 
-                    ? actions 
-                    : actions.Where(x => x.Name.Contains(textFilter, StringComparison.InvariantCultureIgnoreCase));
-                
-                // Apply category filter (AND operator with text filter)
+                // Apply category filter first
+                IEnumerable<ScriptConfig> configs = actions;
                 if (!string.IsNullOrWhiteSpace(categoryFilter) && categoryFilter != "All")
                 {
                     if (categoryFilter == "(No Category)")
@@ -416,19 +420,39 @@ public MainWindowViewModel(ParamsPanelFactory paramsPanelFactory, VaultProvider
                 // When a specific category is filtered, show each action only once under that category
                 if (!string.IsNullOrWhiteSpace(categoryFilter) && categoryFilter != "All")
                 {
-                    scriptConfigGroupWrappers = new[]
+                    var expandedEntries = configs.SelectMany(c => 
+                        c.PredefinedArgumentSets.Select(p => new TaggedScriptConfig(
+                            categoryFilter, 
+                            p.Description == "<default>" ? c.Name : $"{c.Name} - {p.Description}", 
+                            c,
+                            p
+                        ))
+                    );
+                    
+                    // Apply text filter to expanded entries
+                    if (!string.IsNullOrWhiteSpace(textFilter))
                     {
-                        new ScriptConfigGroupWrapper
+                        expandedEntries = expandedEntries.Where(x => x.Name.Contains(textFilter, StringComparison.InvariantCultureIgnoreCase));
+                    }
+                    
+                    var children = expandedEntries.OrderBy(x => x.Name).ToList();
+                    
+                    // Only create group if it has children
+                    scriptConfigGroupWrappers = children.Any() 
+                        ? new[]
                         {
-                            Name = categoryFilter,
-                            Children = configs.Select(c => new TaggedScriptConfig(categoryFilter, c.Name, c)).OrderBy(x => x.Name)
+                            new ScriptConfigGroupWrapper
+                            {
+                                Name = categoryFilter,
+                                Children = children
+                            }
                         }
-                    };
+                        : Enumerable.Empty<ScriptConfigGroupWrapper>();
                 }
                 else
                 {
                     // When no filter or "All" is selected, show actions grouped by all their categories
-                    scriptConfigGroupWrappers = configs.SelectMany(c =>
+                    var groupedConfigs = configs.SelectMany(c =>
                         {
                             if (c.Categories is {Count: > 0})
                             {
@@ -436,18 +460,42 @@ public MainWindowViewModel(ParamsPanelFactory paramsPanelFactory, VaultProvider
                             }
 
                             return new[] {(category: "(No Category)", script: c)};
-                        }).GroupBy(x => x.category).OrderBy(x=>x.Key)
-                        .Select(x=> new ScriptConfigGroupWrapper
+                        }).GroupBy(x => x.category).OrderBy(x=>x.Key);
+                    
+                    scriptConfigGroupWrappers = groupedConfigs.Select(x =>
+                    {
+                        var expandedEntries = x.SelectMany(p => 
+                            p.script.PredefinedArgumentSets.Select(argSet => new TaggedScriptConfig(
+                                x.Key, 
+                                argSet.Description == "<default>" ? p.script.Name : $"{p.script.Name} - {argSet.Description}", 
+                                p.script,
+                                argSet
+                            ))
+                        );
+                        
+                        // Apply text filter to expanded entries
+                        if (!string.IsNullOrWhiteSpace(textFilter))
+                        {
+                            expandedEntries = expandedEntries.Where(e => e.Name.Contains(textFilter, StringComparison.InvariantCultureIgnoreCase));
+                        }
+                        
+                        return new ScriptConfigGroupWrapper
                         {
                             Name = x.Key,
-                            Children = x.Select(p=> new TaggedScriptConfig(x.Key, p.script.Name, p.script)).OrderBy(x=>x.Name)
-                        });
+                            Children = expandedEntries.OrderBy(e => e.Name)
+                        };
+                    }).Where(group => group.Children.Any()); // Filter out empty groups
                 }
                 
                 return scriptConfigGroupWrappers;
             })
             .ObserveOn(RxApp.MainThreadScheduler)
             .ToProperty(this, x => x.FilteredActionList, out _filteredActionList);
+
+        this.WhenAnyValue(x => x.Actions)
+            .Select(list => list?.Count ?? 0)
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .ToProperty(this, x => x.ActionCount, out _actionCount);
             
         Observable
             .FromEventPattern<NotifyCollectionChangedEventHandler, NotifyCollectionChangedEventArgs>(
@@ -1448,4 +1496,9 @@ public class ScriptConfigGroupWrapper
     public IEnumerable<TaggedScriptConfig> Children { get; set; }
 }
 
-public record TaggedScriptConfig(string Tag, string Name, ScriptConfig Config);
+public record TaggedScriptConfig(string Tag, string Name, ScriptConfig Config, ArgumentSet ArgumentSet = null)
+{
+    public string IconName => "fa-scroll";
+    public string IconColor => ArgumentSet?.Description == "<default>" ? "#3baced" : "#ff8c00";
+}
+
diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/SearchBoxViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/SearchBoxViewModel.cs
index d8ffc59..8c9512d 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/SearchBoxViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/SearchBoxViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
@@ -33,7 +33,8 @@ public SearchBoxViewModel(IReadOnlyList<ScriptConfig> allActions, IReadOnlyList<
                 ArgumentSet = p,
                 FullName = p.Description == "<default>"? x.FullName : $"{x.FullName} - {p.Description}",
                 ActionName =  p.Description == "<default>"? x.Name : $"{x.Name} - {p.Description}",
-                SourceName = x.SourceName
+                SourceName = x.SourceName,
+                IconColor = p.Description == "<default>" ? "#3baced" : "#ff8c00"
             })).ToList();
 
             var intial = true;
@@ -105,6 +106,7 @@ public class ScriptConfigWithArgumentSet
         public string FullName { get; set; }
         public string ActionName { get; set; }
         public string SourceName { get; set; }
+        public string IconColor { get; set; }
         
     }
 }
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/ActionDetailsSection.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/ActionDetailsSection.axaml
index ade5412..c128295 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/ActionDetailsSection.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/ActionDetailsSection.axaml
@@ -38,10 +38,26 @@
                   <Button DockPanel.Dock="Top" HorizontalAlignment="Right"  Background="Transparent"  avalonia:Attached.Icon="fas fa-cog" Width="35" Height="35" VerticalAlignment="Top" >
                     <Button.Flyout>
                       <MenuFlyout Placement="BottomEdgeAlignedLeft" >
-                        <MenuItem Header="Reinstall script" IsVisible="{Binding InstallAvailable}" Command="{Binding InstallScript}" />
-                        <MenuItem Header="Reset default settings"  Command="{Binding ResetDefaults}" />
-                        <MenuItem Header="Open containing dir in VSCode"  Command="{Binding OpenDirInVsCode}" />
-                        <MenuItem Header="Open definition in VSCode"  Command="{Binding OpenDefinitionInVsCode}" />
+                        <MenuItem Header="Reinstall script" IsVisible="{Binding InstallAvailable}" Command="{Binding InstallScript}">
+                          <MenuItem.Icon>
+                            <avalonia:Icon Value="fas fa-sync" />
+                          </MenuItem.Icon>
+                        </MenuItem>
+                        <MenuItem Header="Reset default settings"  Command="{Binding ResetDefaults}">
+                          <MenuItem.Icon>
+                            <avalonia:Icon Value="fas fa-undo" />
+                          </MenuItem.Icon>
+                        </MenuItem>
+                        <MenuItem Header="Open containing dir in VSCode"  Command="{Binding OpenDirInVsCode}">
+                          <MenuItem.Icon>
+                            <avalonia:Icon Value="fas fa-folder-open" />
+                          </MenuItem.Icon>
+                        </MenuItem>
+                        <MenuItem Header="Open definition in VSCode"  Command="{Binding OpenDefinitionInVsCode}">
+                          <MenuItem.Icon>
+                            <avalonia:Icon Value="fas fa-file-code" />
+                          </MenuItem.Icon>
+                        </MenuItem>
                       </MenuFlyout>
                     </Button.Flyout>
                   </Button>
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml
index 70bb807..b769514 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml
@@ -1,4 +1,4 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -40,9 +40,10 @@
         </Style>
     </UserControl.Styles>
     
-    <Grid RowDefinitions="Auto,Auto,Auto,*">
+    <Grid RowDefinitions="Auto,Auto,Auto,*,Auto">
         <!-- View Mode Tabs -->
         <Border Grid.Row="0" Background="#252526" BorderBrush="#3f3f46" BorderThickness="0,0,0,1" Padding="10,5">
+
             <StackPanel Orientation="Horizontal" Spacing="5">
                 <RadioButton GroupName="ViewMode" IsChecked="{Binding IsTreeViewMode}" Padding="12,6">
                     <StackPanel Orientation="Horizontal" Spacing="6">
@@ -162,7 +163,7 @@
                     </TreeDataTemplate>
                     <DataTemplate x:DataType="viewModels:TaggedScriptConfig">
                         <StackPanel Orientation="Horizontal" Spacing="8">
-                            <avalonia:Icon Value="fa-file-code" FontSize="16" Foreground="#3baced" />
+                            <avalonia:Icon Value="{Binding IconName}" FontSize="16" Foreground="{Binding IconColor}" />
                             <TextBlock Text="{Binding Name}" VerticalAlignment="Center" />
                         </StackPanel>
                     </DataTemplate>
@@ -196,21 +197,21 @@
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate x:DataType="viewModels:TaggedScriptConfig">
                                             <Border CornerRadius="4"
-                                                    Padding="16,12"
+                                                    Padding="12,12"
                                                     Margin="4,2"
                                                     Cursor="Hand"
                                                     Classes="actionTile"
                                                     Tapped="ActionTile_OnTapped">
                                                 <Grid RowDefinitions="Auto,Auto,Auto">
                                                     <!-- Action Name with Icon -->
-                                                    <StackPanel Orientation="Horizontal" Spacing="10" Grid.Row="0">
-                                                        <avalonia:Icon Value="fa-file-code" FontSize="20" Foreground="#3baced" VerticalAlignment="Top" Margin="0,2,0,0"/>
-                                                        <TextBlock Text="{Binding Name}" 
+                                                    <Grid ColumnDefinitions="Auto,*" Grid.Row="0">
+                                                        <avalonia:Icon Grid.Column="0" Value="{Binding IconName}" FontSize="20" Foreground="{Binding IconColor}" VerticalAlignment="Top" Margin="0,2,10,0"/>
+                                                        <TextBlock Grid.Column="1" Text="{Binding Name}" 
                                                                    FontSize="15"
                                                                    FontWeight="SemiBold"
                                                                    TextWrapping="Wrap"
                                                                    VerticalAlignment="Center"/>
-                                                    </StackPanel>
+                                                    </Grid>
                                                     
                                                     <!-- Description -->
                                                     <TextBlock Grid.Row="1"
@@ -218,7 +219,7 @@
                                                                Foreground="#b0b0b0"
                                                                FontSize="12"
                                                                TextWrapping="Wrap"
-                                                               Margin="30,6,0,0"
+                                                               Margin="32,6,0,0"
                                                                MaxHeight="40"
                                                                TextTrimming="CharacterEllipsis"
                                                                IsVisible="{Binding Config.Description, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
@@ -226,7 +227,7 @@
                                                     <!-- Category Badges -->
                                                     <ItemsControl Grid.Row="2"
                                                                   ItemsSource="{Binding Config.Categories}" 
-                                                                  Margin="30,8,0,0"
+                                                                  Margin="32,8,0,0"
                                                                   IsVisible="{Binding Config.Categories.Count}">
                                                         <ItemsControl.ItemsPanel>
                                                             <ItemsPanelTemplate>
@@ -258,5 +259,15 @@
                 </ItemsControl>
             </ScrollViewer>
         </Panel>
+        
+        <!-- Footer -->
+        <Border Grid.Row="4" Background="#252526" BorderBrush="#3f3f46" BorderThickness="0,1,0,0" Padding="12,8">
+            <TextBlock Text="{Binding ActionCount, StringFormat='Total actions: {0}'}" 
+                       Foreground="#888888" 
+                       FontSize="12" 
+                       VerticalAlignment="Center"
+                       HorizontalAlignment="Left"/>
+        </Border>
     </Grid>
 </UserControl>
+
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/SearchBox.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/SearchBox.axaml
index 00f7752..93c8981 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/SearchBox.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/SearchBox.axaml
@@ -10,62 +10,73 @@
                           
                            x:Class="ScriptRunner.GUI.Views.SearchBox"
                            x:DataType="viewModels:SearchBoxViewModel">
-    <StackPanel Width="550" >
-      <Border BorderThickness="1"   BorderBrush="#3baced"  Background="#212121" CornerRadius="5" >
-          <StackPanel Orientation="Vertical"  Margin="15,10">
-              <TextBox TabIndex="1" Name="SearchBoxInput" Text="{Binding SearchFilter }" CornerRadius="5">
-                  <TextBox.InnerLeftContent>
-                      <avalonia:Icon Value="fas fa-search" Margin="10,0,0,0" />
-                  </TextBox.InnerLeftContent>
-              </TextBox>
-              <ListBox Margin="0,10,0,0" Background="Transparent" ItemsSource="{Binding FilteredActionList}" Name="FilteredItems"  MaxHeight="400" PointerReleased="ClickOnItem">
+    <StackPanel Width="600">
+      <Border BorderThickness="1" BorderBrush="#454545" Background="#1e1e1e" CornerRadius="12" BoxShadow="0 10 40 0 #99000000">
+          <StackPanel Orientation="Vertical" Margin="0">
+              
+              <!-- Header / Search Area -->
+              <Border Padding="16" Background="#252525" CornerRadius="12 12 0 0">
+                  <TextBox TabIndex="1" Name="SearchBoxInput" Text="{Binding SearchFilter}" Watermark="Type to search..." CornerRadius="8" BorderThickness="0" Background="#333333">
+                      <TextBox.InnerLeftContent>
+                          <avalonia:Icon Value="fas fa-search" Margin="12,0,4,0" Foreground="#888888" />
+                      </TextBox.InnerLeftContent>
+                  </TextBox>
+              </Border>
+
+              <ListBox Margin="0" Background="Transparent" ItemsSource="{Binding FilteredActionList}" Name="FilteredItems" MaxHeight="450" PointerReleased="ClickOnItem" Padding="8">
+                  <ListBox.Styles>
+                      <Style Selector="ListBoxItem">
+                          <Setter Property="CornerRadius" Value="6" />
+                          <Setter Property="Padding" Value="12,8" />
+                          <Setter Property="Margin" Value="0,2" />
+                      </Style>
+                  </ListBox.Styles>
                   <ListBox.ItemTemplate>
                       <DataTemplate>
-                          <StackPanel>
-                              <StackPanel Orientation="Horizontal">
-                                  <avalonia:Icon Value="fas fa-scroll" Margin="0,0,10,0" VerticalAlignment="Center" />
-                                  <TextBlock Text="{Binding ActionName}" VerticalAlignment="Center" ></TextBlock>
-                              </StackPanel>
-                                <TextBlock Text="{Binding SourceName}" FontSize="10" Foreground="#6e6e6e"></TextBlock>
-                          </StackPanel> 
-                          
+                           <Grid RowDefinitions="Auto,Auto">
+                               <Grid Grid.Row="0" ColumnDefinitions="Auto,*">
+                                   <avalonia:Icon Grid.Column="0" Value="fas fa-scroll" FontSize="14" VerticalAlignment="Center" Opacity="0.7" Foreground="{Binding IconColor}" Margin="0,0,10,0" />
+                                   <TextBlock Grid.Column="1" Text="{Binding ActionName}" FontWeight="SemiBold" FontSize="14" VerticalAlignment="Center" TextWrapping="Wrap" />
+                               </Grid>
+                                 <TextBlock Grid.Row="1" Text="{Binding SourceName}" FontSize="12" Foreground="#888888" Margin="24,2,0,0" TextTrimming="CharacterEllipsis" />
+                           </Grid>
                       </DataTemplate>
                   </ListBox.ItemTemplate>
               </ListBox>
               
               <!-- Keyboard Shortcuts Footer -->
-              <Border Margin="0,10,0,0" Padding="8,6" Background="#1a1a1a" CornerRadius="3">
-                  <StackPanel Orientation="Horizontal" Spacing="15">
-                      <StackPanel Orientation="Horizontal" Spacing="5">
-                          <Border Background="#2d2d2d" Padding="4,2" CornerRadius="2">
-                              <TextBlock Text="↑↓" FontSize="10" Foreground="#a0a0a0" />
+              <Border Padding="12,8" Background="#252525" CornerRadius="0 0 12 12" BorderThickness="0,1,0,0" BorderBrush="#333333">
+                  <StackPanel Orientation="Horizontal" Spacing="20" HorizontalAlignment="Center">
+                      <StackPanel Orientation="Horizontal" Spacing="6">
+                          <Border Background="#333333" Padding="6,4,6,2" CornerRadius="4" BorderThickness="1" BorderBrush="#444444">
+                              <TextBlock Text="↑↓" FontSize="11" Foreground="#cccccc" FontFamily="Consolas, Monospace" VerticalAlignment="Center" />
                           </Border>
-                          <TextBlock Text="Navigate" FontSize="10" Foreground="#a0a0a0" VerticalAlignment="Center" />
+                          <TextBlock Text="Navigate" FontSize="11" Foreground="#999999" VerticalAlignment="Center" />
                       </StackPanel>
                       
-                      <StackPanel Orientation="Horizontal" Spacing="5">
-                          <Border Background="#2d2d2d" Padding="4,2" CornerRadius="2">
-                              <TextBlock Text="Enter" FontSize="10" Foreground="#a0a0a0" />
+                      <StackPanel Orientation="Horizontal" Spacing="6">
+                          <Border Background="#333333" Padding="6,4,6,2" CornerRadius="4" BorderThickness="1" BorderBrush="#444444">
+                              <TextBlock Text="Enter" FontSize="11" Foreground="#cccccc" FontFamily="Consolas, Monospace" VerticalAlignment="Center" />
                           </Border>
-                          <TextBlock Text="Open" FontSize="10" Foreground="#a0a0a0" VerticalAlignment="Center" />
+                          <TextBlock Text="Open" FontSize="11" Foreground="#999999" VerticalAlignment="Center" />
                       </StackPanel>
                       
-                      <StackPanel Orientation="Horizontal" Spacing="5">
-                          <Border Background="#2d2d2d" Padding="4,2" CornerRadius="2">
-                              <TextBlock Text="Ctrl+Enter" FontSize="10" Foreground="#a0a0a0" />
+                      <StackPanel Orientation="Horizontal" Spacing="6">
+                          <Border Background="#333333" Padding="6,4,6,2" CornerRadius="4" BorderThickness="1" BorderBrush="#444444">
+                              <TextBlock Text="Ctrl+Enter" FontSize="11" Foreground="#cccccc" FontFamily="Consolas, Monospace" VerticalAlignment="Center" />
                           </Border>
-                          <TextBlock Text="Auto Launch" FontSize="10" Foreground="#a0a0a0" VerticalAlignment="Center" />
+                          <TextBlock Text="Run" FontSize="11" Foreground="#999999" VerticalAlignment="Center" />
                       </StackPanel>
                       
-                      <StackPanel Orientation="Horizontal" Spacing="5">
-                          <Border Background="#2d2d2d" Padding="4,2" CornerRadius="2">
-                              <TextBlock Text="Ctrl+Click" FontSize="10" Foreground="#a0a0a0" />
+                      <StackPanel Orientation="Horizontal" Spacing="6">
+                          <Border Background="#333333" Padding="6,4,6,2" CornerRadius="4" BorderThickness="1" BorderBrush="#444444">
+                              <TextBlock Text="Ctrl+Click" FontSize="11" Foreground="#cccccc" FontFamily="Consolas, Monospace" VerticalAlignment="Center" />
                           </Border>
-                          <TextBlock Text="Auto Launch" FontSize="10" Foreground="#a0a0a0" VerticalAlignment="Center" />
+                          <TextBlock Text="Run" FontSize="11" Foreground="#999999" VerticalAlignment="Center" />
                       </StackPanel>
                   </StackPanel>
               </Border>
           </StackPanel>
       </Border>
-  </StackPanel>
+    </StackPanel>
 </reactiveUi:ReactiveUserControl>
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/SideMenu.axaml.cs b/src/ScriptRunner/ScriptRunner.GUI/Views/SideMenu.axaml.cs
index 3822857..84a3119 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/SideMenu.axaml.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/SideMenu.axaml.cs
@@ -83,17 +83,13 @@ private async void OpenSearchBox(object? sender, RoutedEventArgs e)
 
                     if (pattern.EventArgs is SearchBox.ResultSelectedEventArgs {Result: { } selectedCommand, AutoLaunch: var autoLaunch})
                     {
-                        var selectedTagged = viewModel.FilteredActionList.SelectMany(x => x.Children)
-                            .FirstOrDefault(x => x.Config == selectedCommand.Config);
-
-                        if (selectedTagged != null)
+                        // Set SelectedAction directly (same pattern as ExecutionLog selection)
+                        // This works regardless of any active category filter
+                        viewModel.SelectedAction = selectedCommand.Config;
+                        viewModel.SelectedArgumentSet = selectedCommand.ArgumentSet;
+                        if (autoLaunch)
                         {
-                            viewModel.SelectedActionOrGroup = selectedTagged;
-                            viewModel.SelectedArgumentSet = selectedCommand.ArgumentSet;
-                            if (autoLaunch)
-                            {
-                                viewModel.RunScript();
-                            }
+                            viewModel.RunScript();
                         }
                     }
                 });