diff --git a/app/DD-Record-Organiser/ClassControlBuilder.vb b/app/DD-Record-Organiser/ClassControlBuilder.vb
index ba9e2b3..3a650de 100644
--- a/app/DD-Record-Organiser/ClassControlBuilder.vb
+++ b/app/DD-Record-Organiser/ClassControlBuilder.vb
@@ -2367,9 +2367,8 @@ Public Class ClassControlBuilder
                 Next
             End If
 
-            If Not _designMode Then
-                Me.SetEventHandlers(control)
-            End If
+            Me.SetEventHandlers(control)
+
             Me.CurrentControl = DirectCast(control, DevExpress.XtraEditors.CheckedListBoxControl)
             If Not IsNothing(parent) Then
                 control.Parent = parent