diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs
index 7633e34a7..a1d3b83ab 100644
--- a/Flow.Launcher.Plugin/Result.cs
+++ b/Flow.Launcher.Plugin/Result.cs
@@ -37,7 +37,11 @@ namespace Flow.Launcher.Plugin
         /// user's clipboard when Ctrl + C is pressed on a result. If the text is a file/directory path
         /// flow will copy the actual file/folder instead of just the path text.
         /// </summary>
-        public string CopyText { get; set; } = string.Empty;
+        public string CopyText
+        {
+            get => string.IsNullOrEmpty(_copyText) ? SubTitle : _copyText;
+            set => _copyText = value;
+        }
 
         /// <summary>
         /// This holds the text which can be provided by plugin to help Flow autocomplete text
@@ -81,6 +85,7 @@ namespace Flow.Launcher.Plugin
         /// Delegate to Get Image Source
         /// </summary>
         public IconDelegate Icon;
+        private string _copyText = string.Empty;
 
         /// <summary>
         /// Information for Glyph Icon (Prioritized than IcoPath/Icon if user enable Glyph Icons)
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 006d394fe..3e89ae5e0 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -288,8 +288,6 @@
                         <flowlauncher:ResultListBox
                             x:Name="ResultListBox"
                             DataContext="{Binding Results}"
-                            MouseMove="ResultList_MouseMove"
-                            PreviewMouseLeftButtonDown="ResultList_PreviewMouseLeftButtonDown"
                             PreviewMouseLeftButtonUp="OnPreviewMouseButtonDown" />
                     </ContentControl>
                 </Border>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index ac0393855..72fd97b3b 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -374,41 +374,6 @@ namespace Flow.Launcher
             e.Handled = true;
         }
 
-        private Point start;
-
-        private void ResultList_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            this.start = e.GetPosition(null);
-        }
-
-        private void ResultList_MouseMove(object sender, System.Windows.Input.MouseEventArgs e)
-        {
-            if (this.ResultListBox.SelectedItems.Count == 0)
-            {
-                return;
-            }
-            
-            Point mpos = e.GetPosition(null);
-            Vector diff = this.start - mpos;
-
-            var r = (ResultListBox)sender;
-            var d = (DependencyObject)e.OriginalSource;
-            var item = ItemsControl.ContainerFromElement(r, d) as ListBoxItem;
-            var result = (ResultViewModel)item?.DataContext;
-
-            if (e.LeftButton == MouseButtonState.Pressed &&
-              Math.Abs(diff.X) > SystemParameters.MinimumHorizontalDragDistance &&
-              Math.Abs(diff.Y) > SystemParameters.MinimumVerticalDragDistance)
-            {
-                string copyText = string.IsNullOrEmpty(result.Result.CopyText) ? result.Result.SubTitle : result.Result.CopyText;
-                string[] files = { copyText };
-                var data = new DataObject(System.Windows.DataFormats.FileDrop, files);
-                DragDrop.DoDragDrop(this.ResultListBox, data, System.Windows.DragDropEffects.Move | System.Windows.DragDropEffects.Copy);
-                e.Handled = true;
-            }
-        }
-
-
         private async void OnContextMenusForSettingsClick(object sender, RoutedEventArgs e)
         {
             _viewModel.Hide();
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 869045526..1ece390d1 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -25,12 +25,15 @@
     VirtualizingStackPanel.IsVirtualizing="True"
     VirtualizingStackPanel.VirtualizationMode="Standard"
     Visibility="{Binding Visbility}"
-    mc:Ignorable="d">
+    mc:Ignorable="d"
+    PreviewMouseMove="ResultList_MouseMove"
+    PreviewMouseLeftButtonDown="ResultList_PreviewMouseLeftButtonDown">
     <!--  IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083  -->
 
     <ListBox.ItemTemplate>
         <DataTemplate>
-            <Button HorizontalAlignment="Stretch">
+            <Button
+                HorizontalAlignment="Stretch">
                 <Button.Template>
                     <ControlTemplate>
                         <ContentPresenter Content="{TemplateBinding Button.Content}" />
diff --git a/Flow.Launcher/ResultListBox.xaml.cs b/Flow.Launcher/ResultListBox.xaml.cs
index fd980e016..27037241c 100644
--- a/Flow.Launcher/ResultListBox.xaml.cs
+++ b/Flow.Launcher/ResultListBox.xaml.cs
@@ -1,6 +1,9 @@
-using System.Windows;
+using System;
+using System.IO;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher
 {
@@ -24,7 +27,7 @@ namespace Flow.Launcher
 
         private void OnMouseEnter(object sender, MouseEventArgs e)
         {
-            lock(_lock)
+            lock (_lock)
             {
                 curItem = (ListBoxItem)sender;
                 var p = e.GetPosition((IInputElement)sender);
@@ -34,7 +37,7 @@ namespace Flow.Launcher
 
         private void OnMouseMove(object sender, MouseEventArgs e)
         {
-            lock(_lock)
+            lock (_lock)
             {
                 var p = e.GetPosition((IInputElement)sender);
                 if (_lastpos != p)
@@ -46,7 +49,7 @@ namespace Flow.Launcher
 
         private void ListBox_PreviewMouseDown(object sender, MouseButtonEventArgs e)
         {
-            lock(_lock)
+            lock (_lock)
             {
                 if (curItem != null)
                 {
@@ -54,5 +57,45 @@ namespace Flow.Launcher
                 }
             }
         }
+
+
+        private Point start;
+        private string file;
+
+        private void ResultList_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (Mouse.DirectlyOver is not FrameworkElement { DataContext: ResultViewModel result })
+                return;
+
+            file = result.Result.CopyText;
+            start = e.GetPosition(null);
+        }
+
+        private void ResultList_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.LeftButton != MouseButtonState.Pressed)
+            {
+                start = default;
+                file = null;
+                return;
+            }
+
+            Point mpos = e.GetPosition(null);
+            Vector diff = this.start - mpos;
+
+            if (Math.Abs(diff.X) < SystemParameters.MinimumHorizontalDragDistance
+                || Math.Abs(diff.Y) < SystemParameters.MinimumVerticalDragDistance)
+                return;
+
+            DataObject data;
+            data = File.Exists(file)
+                ? new DataObject(DataFormats.FileDrop, new[]
+                {
+                    file
+                })
+                : new DataObject(DataFormats.UnicodeText, file);
+            DragDrop.DoDragDrop((DependencyObject)sender, data, DragDropEffects.Move | DragDropEffects.Copy);
+            e.Handled = true;
+        }
     }
 }
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 2f07f43db..1b1a6d73b 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -969,28 +969,26 @@ namespace Flow.Launcher.ViewModel
                 var result = Results.SelectedItem?.Result;
                 if (result != null)
                 {
-                    string copyText = string.IsNullOrEmpty(result.CopyText) ? result.SubTitle : result.CopyText;
+                    string copyText = result.CopyText;
                     var isFile = File.Exists(copyText);
                     var isFolder = Directory.Exists(copyText);
                     if (isFile || isFolder)
                     {
-                        var paths = new StringCollection();
-                        paths.Add(copyText);
+                        var paths = new StringCollection
+                        {
+                            copyText
+                        };
 
                         Clipboard.SetFileDropList(paths);
                         App.API.ShowMsg(
-                            App.API.GetTranslation("copy")
-                            + " "
-                            + (isFile ? App.API.GetTranslation("fileTitle") : App.API.GetTranslation("folderTitle")),
+                            $"{App.API.GetTranslation("copy")} {(isFile ? App.API.GetTranslation("fileTitle") : App.API.GetTranslation("folderTitle"))}",
                             App.API.GetTranslation("completedSuccessfully"));
                     }
                     else
                     {
-                        Clipboard.SetDataObject(copyText.ToString());
+                        Clipboard.SetDataObject(copyText);
                         App.API.ShowMsg(
-                            App.API.GetTranslation("copy")
-                            + " "
-                            + App.API.GetTranslation("textTitle"),
+                            $"{App.API.GetTranslation("copy")} {App.API.GetTranslation("textTitle")}",
                             App.API.GetTranslation("completedSuccessfully"));
                     }
                 }