diff --git a/tools/clog-builder-control-events.lisp b/tools/clog-builder-control-events.lisp
index bfd483b..69ed76c 100644
--- a/tools/clog-builder-control-events.lisp
+++ b/tools/clog-builder-control-events.lisp
@@ -213,11 +213,13 @@
                                                          :selected (equal attr current))))
                            (set-on-click opt (lambda (obj)
                                                (declare (ignore obj))
-                                               (setf (text-value (event-editor app)) "")
+                                               (unless (equalp (attribute elist "data-current-event") attr)
+                                                 (setf (text-value (event-editor app)) ""))
                                                (setf (text-value (event-info app))
-                                                     (format nil "~A (panel ~A)"
+                                                     (format nil "~A (panel ~A) for ~A"
                                                              (getf event :name)
-                                                             (getf event :parameters)))))))
+                                                             (getf event :parameters)
+                                                             (attribute control "data-clog-name")))))))
                        (set-on-change elist #'on-change))
                      (on-blur (obj)
                        (declare (ignore obj))
@@ -226,7 +228,7 @@
                          (unless (equalp attr "undefined")
                            (let ((opt (select-text elist))
                                  (txt (text-value (event-editor app))))
-                             (when (equalP (format nil "data-~A" (text-value elist)) attr)
+                             (when (equalp (format nil "data-~A" (text-value elist)) attr)
                                (setf (char opt 0) #\space)
                                (setf opt (string-left-trim "#\space" opt))
                                (cond ((or (equal txt "")
diff --git a/tools/clog-builder-control-properties.lisp b/tools/clog-builder-control-properties.lisp
index d3952a1..f3bf8fd 100644
--- a/tools/clog-builder-control-properties.lisp
+++ b/tools/clog-builder-control-properties.lisp
@@ -158,6 +158,7 @@
                                           (when (equal (subseq vname 0 1) "(")
                                             (setf vname (format nil "|~A|" vname)))
                                           (setf (attribute control "data-clog-name") vname)
+                                          (on-populate-control-events-win panel)
                                           (on-populate-control-list-win panel :win win)
                                           (when (equal (getf info :name) "clog-data")
                                             (when win
diff --git a/tools/clog-builder-settings-controls.lisp b/tools/clog-builder-settings-controls.lisp
index 78c5de1..ed7684f 100644
--- a/tools/clog-builder-settings-controls.lisp
+++ b/tools/clog-builder-settings-controls.lisp
@@ -366,7 +366,8 @@
                                                           (lambda (result)
                                                             (when result
                                                               (setf (text-value control) result)
-                                                              (adjust-control-placer control)))
+                                                              (adjust-control-placer control)
+                                                              (setf (text td2) result)))
                                                           :default-value (text-value control)
                                                           :width 800
                                                           :height 420