Alt approach

Author: yaira2

src/Files.App/UserControls/TabBar/TabBar.xaml.cs

@@ -4,6 +4,7 @@
 using CommunityToolkit.WinUI.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Shapes;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage;
@@ -142,7 +143,6 @@ private void TabHoverSelected(object sender, object e)
 
 		private void TabView_TabDragStarting(TabView sender, TabViewTabDragStartingEventArgs args)
 		{
-			cancelTagDrag = false;
 			var tabViewItemArgs = (args.Item as TabBarItem).NavigationParameter;
 			args.Data.Properties.Add(TabPathIdentifier, tabViewItemArgs.Serialize());
 			args.Data.RequestedOperation = DataPackageOperation.Move;
@@ -152,14 +152,14 @@ private void TabView_TabDragStarting(TabView sender, TabViewTabDragStartingEvent
 
 			// Force focus in order that the keydown event works
 			Focus(FocusState.Programmatic);
-			PreviewKeyDown += (s, e) =>
-			{
-				if (e.Key is Windows.System.VirtualKey.Escape)
-				{
-					args.Cancel = true;
-					cancelTagDrag = true;
-				}
-			};
+			cancelTagDrag = false;
+			PreviewKeyDown += DraggingKeyDown;
+		}
+
+		private void DraggingKeyDown(object sender, KeyRoutedEventArgs e)
+		{
+			if (e.Key is Windows.System.VirtualKey.Escape)
+				cancelTagDrag = true;
 		}
 
 		private void TabView_TabStripDragOver(object sender, DragEventArgs e)
@@ -217,9 +217,6 @@ private async void TabView_TabStripDrop(object sender, DragEventArgs e)
 
 		private void TabView_TabDragCompleted(TabView sender, TabViewTabDragCompletedEventArgs args)
 		{
-			if (cancelTagDrag)
-				return;
-
 			if (ApplicationData.Current.LocalSettings.Values.ContainsKey(TabDropHandledIdentifier) &&
 				(bool)ApplicationData.Current.LocalSettings.Values[TabDropHandledIdentifier])
 			{
@@ -234,10 +231,14 @@ private void TabView_TabDragCompleted(TabView sender, TabViewTabDragCompletedEve
 			{
 				ApplicationData.Current.LocalSettings.Values.Remove(TabDropHandledIdentifier);
 			}
+
+			PreviewKeyDown -= DraggingKeyDown;
 		}
 
 		private async void TabView_TabDroppedOutside(TabView sender, TabViewTabDroppedOutsideEventArgs args)
 		{
+			PreviewKeyDown -= DraggingKeyDown;
+
 			if (cancelTagDrag)
 				return;