diff --git a/NAPS2.Core/WinForms/FDesktop.Designer.cs b/NAPS2.Core/WinForms/FDesktop.Designer.cs
index 618d1b1155..ea6f0d5912 100644
--- a/NAPS2.Core/WinForms/FDesktop.Designer.cs
+++ b/NAPS2.Core/WinForms/FDesktop.Designer.cs
@@ -596,9 +596,6 @@ private void InitializeComponent()
             this.Controls.Add(this.toolStripContainer1);
             this.DoubleBuffered = true;
             this.Name = "FDesktop";
-            this.Closed += new System.EventHandler(this.FDesktop_Closed);
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FDesktop_FormClosing);
-            this.Shown += new System.EventHandler(this.FDesktop_Shown);
             this.toolStripContainer1.ContentPanel.ResumeLayout(false);
             this.toolStripContainer1.TopToolStripPanel.ResumeLayout(false);
             this.toolStripContainer1.TopToolStripPanel.PerformLayout();
diff --git a/NAPS2.Core/WinForms/FDesktop.cs b/NAPS2.Core/WinForms/FDesktop.cs
index b6052bc70c..f23ce73755 100644
--- a/NAPS2.Core/WinForms/FDesktop.cs
+++ b/NAPS2.Core/WinForms/FDesktop.cs
@@ -93,7 +93,11 @@ public FDesktop(IEmailer emailer, ImageSaver imageSaver, StringWrapper stringWra
             this.pdfSaver = pdfSaver;
             this.errorOutput = errorOutput;
             InitializeComponent();
+
             thumbnailList1.MouseWheel += thumbnailList1_MouseWheel;
+            Shown += FDesktop_Shown;
+            FormClosing += FDesktop_FormClosing;
+            Closed += FDesktop_Closed;
         }
 
         protected override void OnLoad(object sender, EventArgs eventArgs)