diff --git a/src/elogd.cxx b/src/elogd.cxx
index 485e7e5e..cdfcbd6f 100755
--- a/src/elogd.cxx
+++ b/src/elogd.cxx
@@ -11089,6 +11089,11 @@ void show_edit_form(LOGBOOK *lbs, int message_id, BOOL breply, BOOL bedit, BOOL
                      if (getcfg(lbs->name, str, comment, sizeof(comment)))
                         sprintf(tooltip, " title=\"%s\"", comment);
 
+                     sprintf(str, "Tooltip %s %s", attr_list[index], attr_options[index][i]);
+                     tooltip[0] = 0;
+                     if (getcfg(lbs->name, str, comment, sizeof(comment)))
+                        sprintf(tooltip, " title=\"%s\"", comment);
+
                      rsprintf("<span%s style=\"white-space:nowrap;\">\n", tooltip);
 
                      strencode2(str, attr_options[index][i], sizeof(str));
@@ -11105,7 +11110,7 @@ void show_edit_form(LOGBOOK *lbs, int message_id, BOOL breply, BOOL bedit, BOOL
                                 ("<input type=radio id=\"%s\" name=\"%s\" value=\"%s\" onChange=\"mod();\">\n",
                                  str, ua, str);
 
-                     rsprintf("<label for=\"%s\">%s</label>\n", str, str);
+                     rsprintf("<label for=\"%s\"%s>%s</label>\n", str, tooltip, str);
 
                      rsprintf("</span>\n");