diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
index d7413874be1..22f4aea592f 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -41,6 +41,9 @@ public void Save()
 
         public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
         {
+            if (IsStartupIndexProgramsRequired)
+                _ = IndexPrograms();
+
             Win32[] win32;
             UWP.Application[] uwps;
 
@@ -147,7 +150,7 @@ public static async Task IndexPrograms()
 
             var t2 = Task.Run(IndexUwpPrograms);
 
-            await Task.WhenAll(t1, t2);
+            await Task.WhenAll(t1, t2).ConfigureAwait(false);
 
             _settings.LastIndexTime = DateTime.Today;
         }
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
index e4e92b9bc7b..d66ca345e86 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -51,7 +51,7 @@ private void Setting_Loaded(object sender, RoutedEventArgs e)
 
         private void ViewRefresh()
         {
-            if(programSourceView.Items.Count == 0 
+            if (programSourceView.Items.Count == 0
                 && btnProgramSourceStatus.Visibility == Visibility.Visible
                 && btnEditProgramSource.Visibility == Visibility.Visible)
             {
@@ -70,21 +70,19 @@ private void ViewRefresh()
             programSourceView.Items.Refresh();
         }
 
-        private void ReIndexing()
+        private async void ReIndexing()
         {
             ViewRefresh();
-            Task.Run(() =>
-            {
-                Dispatcher.Invoke(() => { indexingPanel.Visibility = Visibility.Visible; });
-                Main.IndexPrograms();
-                Dispatcher.Invoke(() => { indexingPanel.Visibility = Visibility.Hidden; });
-            });
+
+            indexingPanel.Visibility = Visibility.Visible;
+            await Main.IndexPrograms();
+            indexingPanel.Visibility = Visibility.Hidden;
         }
 
         private void btnAddProgramSource_OnClick(object sender, RoutedEventArgs e)
         {
             var add = new AddProgramSource(context, _settings);
-            if(add.ShowDialog() ?? false)
+            if (add.ShowDialog() ?? false)
             {
                 ReIndexing();
             }
@@ -165,14 +163,14 @@ private void programSourceView_Drop(object sender, DragEventArgs e)
                             UniqueIdentifier = directory
                         };
 
-                        directoriesToAdd.Add(source);                        
+                        directoriesToAdd.Add(source);
                     }
                 }
 
                 if (directoriesToAdd.Count() > 0)
                 {
                     directoriesToAdd.ForEach(x => _settings.ProgramSources.Add(x));
-                    directoriesToAdd.ForEach(x => ProgramSettingDisplayList.Add(x));                   
+                    directoriesToAdd.ForEach(x => ProgramSettingDisplayList.Add(x));
 
                     ViewRefresh();
                     ReIndexing();
@@ -238,8 +236,8 @@ private void btnProgramSourceStatus_OnClick(object sender, RoutedEventArgs e)
                 ProgramSettingDisplayList.SetProgramSourcesStatus(selectedItems, true);
 
                 ProgramSettingDisplayList.RemoveDisabledFromSettings();
-            }            
-            
+            }
+
             if (selectedItems.IsReindexRequired())
                 ReIndexing();
 
@@ -282,7 +280,7 @@ private void GridViewColumnHeaderClickedHandler(object sender, RoutedEventArgs e
                     var sortBy = columnBinding?.Path.Path ?? headerClicked.Column.Header as string;
 
                     Sort(sortBy, direction);
-                    
+
                     _lastHeaderClicked = headerClicked;
                     _lastDirection = direction;
                 }