diff --git a/OpenDreamClient/Interface/Controls/ControlInput.cs b/OpenDreamClient/Interface/Controls/ControlInput.cs
index 5589d2c647..31f2801848 100644
--- a/OpenDreamClient/Interface/Controls/ControlInput.cs
+++ b/OpenDreamClient/Interface/Controls/ControlInput.cs
@@ -22,14 +22,14 @@ private void TextBox_OnSubmit(LineEdit.LineEditEventArgs lineEditEventArgs) {
         if (InputDescriptor.NoCommand.Value)
             return;
 
+        ResetText();
+
         var command = InputDescriptor.Command.Value;
         if (command.StartsWith('!')) {
             _interfaceManager.RunCommand(lineEditEventArgs.Text);
         } else {
             _interfaceManager.RunCommand(command + lineEditEventArgs.Text);
         }
-
-        ResetText();
     }
 
     protected override void UpdateElementDescriptor() {
@@ -55,6 +55,9 @@ public override void SetProperty(string property, string value, bool manualWinse
                 if (focusValue.Value)
                     _textBox.GrabKeyboardFocus();
                 break;
+            case "text":
+                _textBox.Text = value;
+                break;
             default:
                 base.SetProperty(property, value, manualWinset);
                 break;