diff --git a/BDInfoAV/Views/MainWindow.axaml b/BDInfoAV/Views/MainWindow.axaml
index 20d16df1d..c5245e7ee 100644
--- a/BDInfoAV/Views/MainWindow.axaml
+++ b/BDInfoAV/Views/MainWindow.axaml
@@ -17,7 +17,8 @@
         SizeChanged="OnSizeChanged"
         Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
         UseLayoutRounding="True"
-        ExtendClientAreaChromeHints="PreferSystemChrome">
+        ExtendClientAreaChromeHints="PreferSystemChrome"
+        DragDrop.AllowDrop="True">
         <!--
         ExtendClientAreaToDecorationsHint="True"
         ExtendClientAreaChromeHints="PreferSystemChrome"
diff --git a/BDInfoAV/Views/MainWindow.axaml.cs b/BDInfoAV/Views/MainWindow.axaml.cs
index 6574de8a7..80232870d 100644
--- a/BDInfoAV/Views/MainWindow.axaml.cs
+++ b/BDInfoAV/Views/MainWindow.axaml.cs
@@ -18,6 +18,9 @@
 //=============================================================================
 
 using Avalonia.Controls;
+using Avalonia.Input;
+using System.Linq;
+using BDInfo.ViewModels;
 
 namespace BDInfo.Views;
 
@@ -29,6 +32,32 @@ public MainWindow()
         InitializeComponent();
         Instance = this;
         this.Position = BDInfoSettings.WindowLocation;
+
+        AddHandler(DragDrop.DropEvent, DropHandler);
+        AddHandler(DragDrop.DragOverEvent, DragOverHandler);
+    }
+
+    private void DragOverHandler(object sender, DragEventArgs e)
+    {
+        // Only allow Copy or Link as Drop Operations.
+        e.DragEffects = e.DragEffects & (DragDropEffects.Copy | DragDropEffects.Link);
+
+        // Only allow if the dragged data contains text or filenames.
+        if (!e.Data.Contains(DataFormats.FileNames))
+            e.DragEffects = DragDropEffects.None;
+    }
+
+    private void DropHandler(object sender, DragEventArgs e)
+    {
+        if (e.Data.Contains(DataFormats.FileNames))
+        {
+            if (DataContext is MainWindowViewModel dataContext)
+            {
+                dataContext.Folder = e.Data.GetFileNames()!.First();
+                dataContext.Rescan();
+            }
+        }
+
     }
 
     private void OnPositionChanged(object sender, PixelPointEventArgs e)