diff --git a/src/ClaudeDo.Ui/Views/Islands/TasksIslandView.axaml.cs b/src/ClaudeDo.Ui/Views/Islands/TasksIslandView.axaml.cs
index 9f53c8d..3137855 100644
--- a/src/ClaudeDo.Ui/Views/Islands/TasksIslandView.axaml.cs
+++ b/src/ClaudeDo.Ui/Views/Islands/TasksIslandView.axaml.cs
@@ -15,8 +15,6 @@ public partial class TasksIslandView : UserControl
     public TasksIslandView()
     {
         InitializeComponent();
-        // Tunnel handler runs BEFORE Button's class handler so we can start a drag
-        // without the Button first marking the event as handled.
         AddHandler(PointerPressedEvent, OnTunnelPointerPressed, RoutingStrategies.Tunnel);
         DataContextChanged += (_, _) =>
         {
@@ -27,14 +25,25 @@ public partial class TasksIslandView : UserControl
 
     private async void OnTunnelPointerPressed(object? sender, PointerPressedEventArgs e)
     {
-        if (DataContext is not TasksIslandViewModel vm || !vm.CanReorder) return;
+        if (DataContext is not TasksIslandViewModel vm) return;
         if (e.Source is not Visual src) return;
 
         var button = src as Button ?? src.FindAncestorOfType<Button>();
         if (button?.DataContext is not TaskRowViewModel row) return;
-        if (row.IsRunning) return;
         if (!e.GetCurrentPoint(button).Properties.IsLeftButtonPressed) return;
 
+        // Select now so the details pane updates whether the gesture becomes a click or a drag.
+        // (Button.Click doesn't fire once DoDragDropAsync captures the pointer.)
+        vm.SelectedTask = row;
+
+        // If the click landed on a nested Button (e.g. the done-toggle checkbox or star),
+        // don't start a drag — that would capture the pointer and swallow the inner Click.
+        var nestedInsideButton = button.Parent is Visual parentVisual
+            && parentVisual.FindAncestorOfType<Button>() is not null;
+        if (nestedInsideButton) return;
+
+        if (!vm.CanReorder || row.IsRunning) return;
+
         var data = new DataTransfer();
         data.Add(DataTransferItem.Create(TaskRowFormat, row.Id));
         try
@@ -133,11 +142,18 @@ public partial class TasksIslandView : UserControl
             if (source is null || source.IsRunning) return;
 
             var placeBelow = e.GetPosition(b).Y > b.Bounds.Height / 2;
+
+            // Clear the 6px drop-hint spacer BEFORE the move so the reorder animates
+            // into its truly-final layout in one step (otherwise the row lands in the
+            // gap, then the gap collapses and everything shifts up a second time).
+            vm.ClearDropHints();
+
             await vm.ReorderAsync(source, target, placeBelow);
         }
-        finally
+        catch
         {
             vm.ClearDropHints();
+            throw;
         }
     }