diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.cs b/ShareX.ImageEffectsLib/ImageEffectsForm.cs
index c2c94d3f4..0968e1155 100644
--- a/ShareX.ImageEffectsLib/ImageEffectsForm.cs
+++ b/ShareX.ImageEffectsLib/ImageEffectsForm.cs
@@ -60,7 +60,7 @@ public ImageEffectsForm(Image img, List<ImageEffectPreset> presets, int selected
             AddAllEffectsToContextMenu();
         }
 
-        public void ToolMode(Action<Image> imageProcessRequested)
+        public void EnableToolMode(Action<Image> imageProcessRequested)
         {
             ImageProcessRequested += imageProcessRequested;
             pbResult.AllowDrop = true;
@@ -206,23 +206,32 @@ private void UpdatePreview()
 
                 if (preset != null && DefaultImage != null)
                 {
-                    Stopwatch timer = Stopwatch.StartNew();
+                    Cursor = Cursors.WaitCursor;
 
-                    using (Image preview = ApplyEffects())
+                    try
                     {
-                        if (preview != null)
+                        Stopwatch timer = Stopwatch.StartNew();
+
+                        using (Image preview = ApplyEffects())
                         {
-                            pbResult.LoadImage(preview);
-                            Text = string.Format("ShareX - " + Resources.ImageEffectsForm_UpdatePreview_Image_effects___Width___0___Height___1___Render_time___2__ms,
-                                preview.Width, preview.Height, timer.ElapsedMilliseconds);
-                        }
-                        else
-                        {
-                            pbResult.Reset();
-                            Text = string.Format("ShareX - " + Resources.ImageEffectsForm_UpdatePreview_Image_effects___Width___0___Height___1___Render_time___2__ms,
-                                0, 0, timer.ElapsedMilliseconds);
+                            if (preview != null)
+                            {
+                                pbResult.LoadImage(preview);
+                                Text = string.Format("ShareX - " + Resources.ImageEffectsForm_UpdatePreview_Image_effects___Width___0___Height___1___Render_time___2__ms,
+                                    preview.Width, preview.Height, timer.ElapsedMilliseconds);
+                            }
+                            else
+                            {
+                                pbResult.Reset();
+                                Text = string.Format("ShareX - " + Resources.ImageEffectsForm_UpdatePreview_Image_effects___Width___0___Height___1___Render_time___2__ms,
+                                    0, 0, timer.ElapsedMilliseconds);
+                            }
                         }
                     }
+                    finally
+                    {
+                        Cursor = Cursors.Default;
+                    }
                 }
 
                 UpdateControlStates();
diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.resx b/ShareX.ImageEffectsLib/ImageEffectsForm.resx
index 3fd69a3d8..cb09bbda8 100644
--- a/ShareX.ImageEffectsLib/ImageEffectsForm.resx
+++ b/ShareX.ImageEffectsLib/ImageEffectsForm.resx
@@ -591,6 +591,9 @@
   <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <data name="btnUploadImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
   <data name="btnUploadImage.Location" type="System.Drawing.Point, System.Drawing">
     <value>456, 504</value>
   </data>
@@ -621,6 +624,9 @@
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>64</value>
+  </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 13</value>
   </data>
diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs
index d6613bc64..17da03b26 100644
--- a/ShareX/TaskHelpers.cs
+++ b/ShareX/TaskHelpers.cs
@@ -980,7 +980,7 @@ public static void OpenImageEffects(TaskSettings taskSettings = null)
                     using (ImageEffectsForm imageEffectsForm = new ImageEffectsForm(img, taskSettings.ImageSettings.ImageEffectPresets,
                         taskSettings.ImageSettings.SelectedImageEffectPreset))
                     {
-                        imageEffectsForm.ToolMode(x => UploadManager.RunImageTask(x, taskSettings));
+                        imageEffectsForm.EnableToolMode(x => UploadManager.RunImageTask(x, taskSettings));
                         imageEffectsForm.ShowDialog();
                         //taskSettings.ImageSettings.SelectedImageEffectPreset = imageEffectsForm.SelectedPresetIndex;
                     }