diff --git a/custom/edit_cmd.cgi b/custom/edit_cmd.cgi
index 66608e83c..9a17ade84 100755
--- a/custom/edit_cmd.cgi
+++ b/custom/edit_cmd.cgi
@@ -31,7 +31,8 @@ if (!$in{'new'}) {
 
 # Description, text and HTML
 print &ui_table_row(&hlink($text{'edit_desc'}, "desc"),
-	&ui_textbox("desc", $cmd->{'desc'}, 60)."<br>".
+	&ui_textbox("desc", $cmd->{'desc'}, 60), 3);
+print &ui_table_row(&hlink($text{'edit_desc2'}, "desc2"),
 	&ui_textarea("html", $cmd->{'html'}, 2, 60), 3);
 
 # Command to run
diff --git a/custom/edit_file.cgi b/custom/edit_file.cgi
index 80b5fb54b..6df0a681a 100755
--- a/custom/edit_file.cgi
+++ b/custom/edit_file.cgi
@@ -29,7 +29,8 @@ if (!$in{'new'}) {
 
 # Description, text and HTML
 print &ui_table_row(&hlink($text{'edit_desc'}, "desc"),
-	&ui_textbox("desc", $edit->{'desc'}, 60)."<br>".
+	&ui_textbox("desc", $edit->{'desc'}, 60));
+print &ui_table_row(&hlink($text{'edit_desc2'}, "desc2"),
 	&ui_textarea("html", $edit->{'html'}, 2, 60));
 
 # File to edit, and environment checkbox
diff --git a/custom/edit_sql.cgi b/custom/edit_sql.cgi
index e46a25f35..5571d9519 100755
--- a/custom/edit_sql.cgi
+++ b/custom/edit_sql.cgi
@@ -42,7 +42,8 @@ if (!$in{'new'}) {
 	print &ui_table_row($text{'edit_id'}, "<tt>$cmd->{'id'}</tt>");
 	}
 print &ui_table_row($text{'edit_desc'},
-		    &ui_textbox("desc", $cmd->{'desc'}, 50)."<br>\n".
+		    &ui_textbox("desc", $cmd->{'desc'}, 50));
+print &ui_table_row($text{'edit_desc2'},
 		    &ui_textarea("html", $cmd->{'html'}, 2, 50));
 
 # Show databse type and name
diff --git a/custom/help/desc2.html b/custom/help/desc2.html
new file mode 100644
index 000000000..fe613c3a1
--- /dev/null
+++ b/custom/help/desc2.html
@@ -0,0 +1,7 @@
+<header>HTML description</header>
+
+This field can be used to enter an optional longer HTML-format description for the command, which will also appear on the module's main page. <p>
+
+<hr>
+
+
diff --git a/custom/lang/en b/custom/lang/en
index 440384ae7..b88638ed4 100644
--- a/custom/lang/en
+++ b/custom/lang/en
@@ -21,6 +21,7 @@ create_title=Create Command
 edit_ecannot=You are not allowed to edit commands
 edit_details=Command details
 edit_desc=Description
+edit_desc2=HTML description
 edit_id=Command ID
 edit_cmd=Command
 edit_dir=Run in directory