diff --git a/cluster-shell/index.cgi b/cluster-shell/index.cgi
index 211f9a60d..786e3a404 100755
--- a/cluster-shell/index.cgi
+++ b/cluster-shell/index.cgi
@@ -18,6 +18,9 @@ close(COMMANDS);
 if (@commands) {
 	print &ui_table_row($text{'index_old'},
 		&ui_select("old", undef, [ &unique(@commands) ])." ".
+		&ui_button($text{'index_edit'}, "clear", undef,
+			   "onClick='form.cmd.value = form.old.value'").
+		" ".
 		&ui_button($text{'index_clear'}, "clear", undef,
 			   "onClick='window.location = \"run.cgi?clear=1\"'"));
 	}
diff --git a/cluster-shell/lang/en b/cluster-shell/lang/en
index 127d004a7..19174f146 100644
--- a/cluster-shell/lang/en
+++ b/cluster-shell/lang/en
@@ -8,6 +8,7 @@ index_this=this server
 index_all=<All hosts>
 index_group=Members of $1
 index_clear=Clear History
+index_edit=Edit Previous
 
 run_title=Run Command
 run_err=Failed to run command