diff --git a/src/Core/FileTime.Core.Services/Tab.cs b/src/Core/FileTime.Core.Services/Tab.cs
index 477bec3..5728d1c 100644
--- a/src/Core/FileTime.Core.Services/Tab.cs
+++ b/src/Core/FileTime.Core.Services/Tab.cs
@@ -124,8 +124,9 @@ public class Tab : ITab
             {
                 var itemSelectingContext = new LastItemSelectingContext(CurrentLocation.Value);
                 var lastItemSelectingContext = _lastItemSelectingContext;
-                _lastItemSelectingContext = itemSelectingContext;
                 if (items == null || items.Count == 0) return Task.FromResult<AbsolutePath?>(null);
+                
+                _lastItemSelectingContext = itemSelectingContext;
                 if (selected != null)
                 {
                     if (items.Any(i => i.FullName == selected.Path))