diff --git a/Plugins/Wox.Plugin.Folder/FolderPluginSettings.xaml b/Plugins/Wox.Plugin.Folder/FolderPluginSettings.xaml
index 4f2270dbd6..93b9178e01 100644
--- a/Plugins/Wox.Plugin.Folder/FolderPluginSettings.xaml
+++ b/Plugins/Wox.Plugin.Folder/FolderPluginSettings.xaml
@@ -10,8 +10,10 @@
 			<RowDefinition Height="*"/>
 			<RowDefinition Height="50"/>
 		</Grid.RowDefinitions>
-		<ListView x:Name="lbxFolders" Grid.Row="0">
-			<ListView.View>
+        <ListView x:Name="lbxFolders" Grid.Row="0" AllowDrop="True"
+                 Drop="lbxFolders_Drop"
+                 DragEnter="lbxFolders_DragEnter">
+            <ListView.View>
 				<GridView>
 					<GridViewColumn Header="{DynamicResource wox_plugin_folder_folder_path}"  Width="180">
 						<GridViewColumn.CellTemplate>
diff --git a/Plugins/Wox.Plugin.Folder/FolderPluginSettings.xaml.cs b/Plugins/Wox.Plugin.Folder/FolderPluginSettings.xaml.cs
index 6fda77e312..64845005ea 100644
--- a/Plugins/Wox.Plugin.Folder/FolderPluginSettings.xaml.cs
+++ b/Plugins/Wox.Plugin.Folder/FolderPluginSettings.xaml.cs
@@ -27,8 +27,13 @@ namespace Wox.Plugin.Folder
             var selectedFolder = lbxFolders.SelectedItem as FolderLink;
             if (selectedFolder != null)
             {
-                FolderStorage.Instance.FolderLinks.Remove(selectedFolder);
-                lbxFolders.Items.Refresh();
+                string msg = string.Format(context.API.GetTranslation("wox_plugin_folder_delete_folder_link"), selectedFolder.Path);
+
+                if (MessageBox.Show(msg, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+                {
+                    FolderStorage.Instance.FolderLinks.Remove(selectedFolder);
+                    lbxFolders.Items.Refresh();
+                }
             }
             else
             {
@@ -82,5 +87,46 @@ namespace Wox.Plugin.Folder
 
             lbxFolders.Items.Refresh();
         }
+
+        private void lbxFolders_Drop(object sender, System.Windows.DragEventArgs e)
+        {
+            string[] files = (string[])e.Data.GetData(System.Windows.DataFormats.FileDrop);
+
+            if (files != null && files.Count() > 0)
+            {
+                if (FolderStorage.Instance.FolderLinks == null)
+                {
+                    FolderStorage.Instance.FolderLinks = new List<FolderLink>();
+                }
+
+                foreach (string s in files)
+                {
+                    if (System.IO.Directory.Exists(s) == true)
+                    {
+                        var newFolder = new FolderLink()
+                        {
+                            Path = s
+                        };
+
+                        FolderStorage.Instance.FolderLinks.Add(newFolder);
+                        FolderStorage.Instance.Save();
+                    }
+
+                    lbxFolders.Items.Refresh();
+                }
+            }
+        }
+
+        private void lbxFolders_DragEnter(object sender, System.Windows.DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(System.Windows.DataFormats.FileDrop))
+            {
+                e.Effects = System.Windows.DragDropEffects.Link;
+            }
+            else
+            {
+                e.Effects = System.Windows.DragDropEffects.None;
+            }
+        }
     }
 }
diff --git a/Plugins/Wox.Plugin.Folder/Languages/en.xaml b/Plugins/Wox.Plugin.Folder/Languages/en.xaml
index 7ad2760390..f9bbd6b3b9 100644
--- a/Plugins/Wox.Plugin.Folder/Languages/en.xaml
+++ b/Plugins/Wox.Plugin.Folder/Languages/en.xaml
@@ -7,5 +7,6 @@
     <system:String x:Key="wox_plugin_folder_add">Add</system:String>
     <system:String x:Key="wox_plugin_folder_folder_path">Folder Path</system:String>
     <system:String x:Key="wox_plugin_folder_select_folder_link_warning">Please select a folder link</system:String>
+    <system:String x:Key="wox_plugin_folder_delete_folder_link">Are your sure to delete {0}?</system:String>
     
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Wox.Plugin.Folder/Languages/zh-cn.xaml b/Plugins/Wox.Plugin.Folder/Languages/zh-cn.xaml
index 9f1ccabe99..559b9f4906 100644
--- a/Plugins/Wox.Plugin.Folder/Languages/zh-cn.xaml
+++ b/Plugins/Wox.Plugin.Folder/Languages/zh-cn.xaml
@@ -7,5 +7,6 @@
     <system:String x:Key="wox_plugin_folder_add">添加</system:String>
     <system:String x:Key="wox_plugin_folder_folder_path">文件夹路径</system:String>
     <system:String x:Key="wox_plugin_folder_select_folder_link_warning">请选择一个文件夹</system:String>
-
+    <system:String x:Key="wox_plugin_folder_delete_folder_link">你确定要删除{0}吗？</system:String>
+    
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Wox.Plugin.Folder/Languages/zh-tw.xaml b/Plugins/Wox.Plugin.Folder/Languages/zh-tw.xaml
index ddc0809a64..27ac719140 100644
--- a/Plugins/Wox.Plugin.Folder/Languages/zh-tw.xaml
+++ b/Plugins/Wox.Plugin.Folder/Languages/zh-tw.xaml
@@ -7,5 +7,6 @@
     <system:String x:Key="wox_plugin_folder_add">添加</system:String>
     <system:String x:Key="wox_plugin_folder_folder_path">文件夾路徑</system:String>
     <system:String x:Key="wox_plugin_folder_select_folder_link_warning">請選擇一個文件夾</system:String>
+    <system:String x:Key="wox_plugin_folder_delete_folder_link">你確認要刪除{0}嗎？</system:String>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml
index 3b268f5755..18b6b9f843 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml
+++ b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml
@@ -16,7 +16,9 @@
             <Button Height="30" HorizontalAlignment="Right" x:Name="btnProgramSuffixes" Width="130" Click="BtnProgramSuffixes_OnClick" Content="{DynamicResource wox_plugin_program_suffixes}"></Button>
             <Button Height="30" HorizontalAlignment="Right" Margin="10 0 0 0" x:Name="btnReindex" Width="100" Click="btnReindex_Click" Content="{DynamicResource wox_plugin_program_reindex}"></Button>
         </StackPanel>
-        <ListView x:Name="programSourceView" Grid.Row="1">
+        <ListView x:Name="programSourceView" Grid.Row="1" AllowDrop="True"
+            DragEnter="programSourceView_DragEnter"
+            Drop="programSourceView_Drop" >
             <ListView.View>
                 <GridView>
                     <GridViewColumn Header="{DynamicResource wox_plugin_program_location}"  Width="400">
diff --git a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs
index 42be6196b4..3037997dfa 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs
@@ -106,5 +106,41 @@ namespace Wox.Plugin.Program
             ProgramSuffixes p = new ProgramSuffixes(context);
             p.ShowDialog();
         }
+
+        private void programSourceView_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            {
+                e.Effects = DragDropEffects.Link;
+            }
+            else
+            {
+                e.Effects = DragDropEffects.None;
+            }
+        }
+
+        private void programSourceView_Drop(object sender, DragEventArgs e)
+        {
+            string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
+
+            if (files != null && files.Length > 0)
+            {
+                foreach (string s in files)
+                {
+                    if (System.IO.Directory.Exists(s) == true)
+                    {
+                        ProgramStorage.Instance.ProgramSources.Add(new ProgramSource()
+                        {
+                            Location = s,
+                            Type = "FileSystemProgramSource",
+                            Enabled = true
+                        });
+
+                        ProgramStorage.Instance.Save();
+                        ReIndexing();
+                    }
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Wox/ImageLoader/ImageLoader.cs b/Wox/ImageLoader/ImageLoader.cs
index c10e880c92..474b47edff 100644
--- a/Wox/ImageLoader/ImageLoader.cs
+++ b/Wox/ImageLoader/ImageLoader.cs
@@ -37,6 +37,8 @@ namespace Wox.ImageLoader
 
         private static ImageSource GetIcon(string fileName)
         {
+            if (System.IO.File.Exists(fileName) == false) return null;
+
             Icon icon = GetFileIcon(fileName);
             if (icon == null) icon = Icon.ExtractAssociatedIcon(fileName);