diff --git a/src/js/core/modal_dialog_forms.js b/src/js/core/modal_dialog_forms.js
index aac81d82..355fad09 100644
--- a/src/js/core/modal_dialog_forms.js
+++ b/src/js/core/modal_dialog_forms.js
@@ -124,6 +124,7 @@ export class FormElementInput extends FormElement {
 
     focus() {
         this.element.focus();
+        this.element.select();
     }
 }
 
diff --git a/src/js/game/systems/constant_signal.js b/src/js/game/systems/constant_signal.js
index 5fabb80e..29079825 100644
--- a/src/js/game/systems/constant_signal.js
+++ b/src/js/game/systems/constant_signal.js
@@ -49,11 +49,12 @@ export class ConstantSignalSystem extends GameSystemWithFilter {
         // Ok, query, but also save the uid because it could get stale
         const uid = entity.uid;
 
+        const signal = entity.components.ConstantSignal.signal;
         const signalValueInput = new FormElementInput({
             id: "signalValue",
             label: fillInLinkIntoTranslation(T.dialogs.editSignal.descShortKey, THIRDPARTY_URLS.shapeViewer),
             placeholder: "",
-            defaultValue: "",
+            defaultValue: signal ? signal.getAsCopyableKey() : "",
             validator: val => this.parseSignalCode(entity, val),
         });