diff --git a/doc/config.html b/doc/config.html
index c4022d3d..44a5978c 100755
--- a/doc/config.html
+++ b/doc/config.html
@@ -1052,11 +1052,12 @@ incorporated in the next version.
         moves the mouse cursor over the attribute name in the entry form.
       </li>
       <li>
-        <b><code>Tooltip &lt;attribute option&gt; = &lt;comment&gt;</code></b><br>
+        <b><code>Tooltip &lt;attribute&gt; &lt;attribute option&gt; = &lt;comment&gt;</code></b><br>
         Same as <code><b>Tooltip &lt;attribute&gt;</b></code>, but for option
         values of a <code><b>MOptions</b></code> attribute. Using this option,
         a different tooltip can be shown above each check box of an optional
-        value for an attribute.        
+        value for an attribute. Please note that attributes or options with
+        spaces should <b>not</b> be enclosed with quotes.      
       </li>
       <li>
         <b><code>Icon comment &lt;icon&gt; = &lt;comment&gt;</code></b><br>
diff --git a/src/elogd.c b/src/elogd.c
index 83214560..44b42c3e 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -10396,6 +10396,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);
+
                      sprintf(str, "%s_%d", ua, i);
                      rsprintf("<span%s style=\"white-space:nowrap;\">\n", tooltip);