diff --git a/src/Greenshot.Editor/Forms/ImageEditorForm.cs b/src/Greenshot.Editor/Forms/ImageEditorForm.cs
index e782aa232..8ab283d0b 100644
--- a/src/Greenshot.Editor/Forms/ImageEditorForm.cs
+++ b/src/Greenshot.Editor/Forms/ImageEditorForm.cs
@@ -181,8 +181,19 @@ namespace Greenshot.Editor.Forms
 
             UpdateUi();
 
-            // Use best fit
-            ZoomBestFitMenuItemClick(this, EventArgs.Empty);
+            // Use best fit, for those capture modes where we can get huge images
+            bool useBestFit = _surface.CaptureDetails.CaptureMode switch
+            {
+                CaptureMode.File => true,
+                CaptureMode.Clipboard => true,
+                CaptureMode.IE => true,
+                _ => false
+            };
+
+            if (useBestFit)
+            {
+                ZoomBestFitMenuItemClick(this, EventArgs.Empty);
+            }
 
             // Workaround: As the cursor is (mostly) selected on the surface a funny artifact is visible, this fixes it.
             HideToolstripItems();
diff --git a/src/Greenshot/App.config b/src/Greenshot/App.config
index 3b81b058d..80b985a5c 100644
--- a/src/Greenshot/App.config
+++ b/src/Greenshot/App.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <configuration>
-  <!--<system.windows.forms jitDebugging="true" />-->
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>