diff --git a/src/core/gui/LabelledControl.ts b/src/core/gui/LabelledControl.ts
index 04bd44a2..797c9ca8 100644
--- a/src/core/gui/LabelledControl.ts
+++ b/src/core/gui/LabelledControl.ts
@@ -13,13 +13,18 @@ export abstract class LabelledControl extends Control {
 
     get label(): Label | undefined {
         if (!this._label && this._label_text != undefined) {
-            this._label = this.disposable(new Label(this._label_text));
+            this._label = this.disposable(
+                new Label(this._label_text, {
+                    enabled: this.enabled.val,
+                    tooltip: this.tooltip.val,
+                }),
+            );
 
             if (!this.id) {
-                this._label.for = this.id = unique_id();
+                this.id = unique_id();
             }
 
-            this._label.enabled.bind_bi(this.enabled);
+            this._label.for = this.id;
         }
 
         return this._label;
@@ -33,10 +38,26 @@ export abstract class LabelledControl extends Control {
 
         this._label_text = options && options.label;
     }
+
+    protected set_enabled(enabled: boolean): void {
+        super.set_enabled(enabled);
+
+        if (this._label) {
+            this._label.enabled.val = enabled;
+        }
+    }
+
+    protected set_tooltip(tooltip: string): void {
+        super.set_tooltip(tooltip);
+
+        if (this._label) {
+            this._label.tooltip.val = tooltip;
+        }
+    }
 }
 
 let id = 0;
 
 function unique_id(): string {
-    return String(id++);
+    return "core_LabelledControl_id_" + String(id++);
 }