diff --git a/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs
index 809182753..eba92e1b2 100644
--- a/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs
+++ b/ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs
@@ -30,7 +30,6 @@ You should have received a copy of the GNU General Public License
 using System.IO;
 using System.Net;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace ShareX.HelpersLib
@@ -127,11 +126,12 @@ private void RunInstallerWithDelay(int delay = 1000)
         {
             if (RunInstallerInBackground)
             {
-                Task.Run(() =>
+                Thread thread = new Thread(() =>
                 {
                     Thread.Sleep(delay);
                     RunInstaller();
                 });
+                thread.Start();
             }
             else
             {
diff --git a/ShareX.MediaLib/Forms/VideoThumbnailerForm.cs b/ShareX.MediaLib/Forms/VideoThumbnailerForm.cs
index 38e71c142..dfc16e6ce 100644
--- a/ShareX.MediaLib/Forms/VideoThumbnailerForm.cs
+++ b/ShareX.MediaLib/Forms/VideoThumbnailerForm.cs
@@ -51,7 +51,7 @@ public VideoThumbnailerForm(string ffmpegPath, VideoThumbnailOptions options)
             pgOptions.SelectedObject = Options;
         }
 
-        private void btnStart_Click(object sender, EventArgs e)
+        private async void btnStart_Click(object sender, EventArgs e)
         {
             string mediaPath = txtMediaPath.Text;
 
@@ -64,10 +64,10 @@ private void btnStart_Click(object sender, EventArgs e)
                 pbProgress.Visible = true;
                 btnStart.Visible = false;
 
-                Task.Run(() =>
-                {
-                    List<VideoThumbnailInfo> thumbnails = null;
+                List<VideoThumbnailInfo> thumbnails = null;
 
+                await Task.Run(() =>
+                {
                     try
                     {
                         VideoThumbnailer thumbnailer = new VideoThumbnailer(mediaPath, FFmpegPath, Options);
@@ -78,20 +78,15 @@ private void btnStart_Click(object sender, EventArgs e)
                     {
                         ex.ShowError();
                     }
-                    finally
-                    {
-                        this.InvokeSafe(() =>
-                        {
-                            if (thumbnails != null)
-                            {
-                                OnThumbnailsTaken(thumbnails);
-                            }
-
-                            btnStart.Visible = true;
-                            pbProgress.Visible = false;
-                        });
-                    }
                 });
+
+                if (thumbnails != null)
+                {
+                    OnThumbnailsTaken(thumbnails);
+                }
+
+                btnStart.Visible = true;
+                pbProgress.Visible = false;
             }
         }