diff --git a/exec/default.src b/exec/default.src
index 65608740681e286c87401edd9bf077ba3e3b8d92..bdeb559cc5503113954a00d9114759357ca1ef65 100644
--- a/exec/default.src
+++ b/exec/default.src
@@ -27,6 +27,8 @@
 
 !include sbbsdefs.inc
 
+str last_str_cmd
+
 # Set return point for main menu commands (via end_cmd)
 cmd_home
 
@@ -166,7 +168,15 @@ cmdkey ;
 	else
 		getstr 40
 		end_if
+    compare_str !
+    if_equal
+        copy str last_str_cmd
+        end_if
 	exec_bin "str_cmds %s"
+    compare_str ""
+    if_not_equal
+        copy last_str_cmd str
+        end_if
 	end_cmd
 
 cmdkey T
@@ -645,7 +655,15 @@ cmdkey ;
 	else
         getstr 40
 		end_if
+    compare_str !
+    if_equal
+        copy str last_str_cmd
+        end_if
 	exec_bin "str_cmds %s"
+    compare_str ""
+    if_not_equal
+        copy last_str_cmd str
+        end_if
 	end_cmd
 
 cmdkey Q