diff --git a/addons/material_maker/engine/nodes/gen_remote.gd b/addons/material_maker/engine/nodes/gen_remote.gd
index ad3f4c605..7b3519af4 100644
--- a/addons/material_maker/engine/nodes/gen_remote.gd
+++ b/addons/material_maker/engine/nodes/gen_remote.gd
@@ -256,11 +256,10 @@ func link_parameter(widget_name : String, generator : MMGenBase, param : String)
 		match widget.type:
 			"linked_control":
 				parameters[widget_name] = generator.parameters[param]
-				# use linked floatedit value(instead of default) when linked
+				# use linked value (instead of widget defaults)
 				var param_def : Dictionary = generator.get_parameter_def(param)
 				if name == "gen_parameters" and param_def.has("type"):
-					if param_def.type == "float":
-						set_parameter(widget_name, parameters[widget_name])
+					set_parameter(widget_name, parameters[widget_name])
 			"config_control":
 				parameters[widget_name] = 0
 	emit_signal("parameter_changed", "__update_all__", null)
diff --git a/material_maker/windows/node_editor/parameter_enum.gd b/material_maker/windows/node_editor/parameter_enum.gd
index 71bfc07fe..e6a4e0855 100644
--- a/material_maker/windows/node_editor/parameter_enum.gd
+++ b/material_maker/windows/node_editor/parameter_enum.gd
@@ -51,23 +51,24 @@ func _on_EnumValues_item_selected(id) -> void:
 	if id >= 0 and id < enum_values.size():
 		enum_current = id
 	elif id == ENUM_EDIT:
-		var dialog = preload("res://material_maker/windows/node_editor/enum_editor.tscn").instantiate()
+		var dialog : Window = preload("res://material_maker/windows/node_editor/enum_editor.tscn").instantiate()
 		dialog.content_scale_factor = content_scale_factor
 		dialog.min_size = Vector2(250, 90) * content_scale_factor
 		var v = enum_values[enum_current]
 		add_child(dialog)
 		dialog.set_value(v.name, v.value)
 		dialog.connect("ok", Callable(self, "update_enum_value").bind(enum_current))
+		dialog.close_requested.connect(dialog.queue_free)
 		dialog.connect("popup_hide", Callable(dialog, "queue_free"))
 		dialog.hide()
 		dialog.popup_centered()
 	elif id == ENUM_ADD:
-		var dialog = preload("res://material_maker/windows/node_editor/enum_editor.tscn").instantiate()
+		var dialog : Window = preload("res://material_maker/windows/node_editor/enum_editor.tscn").instantiate()
 		dialog.content_scale_factor = content_scale_factor
 		dialog.min_size = Vector2(250, 90) * content_scale_factor
 		add_child(dialog)
 		dialog.connect("ok", Callable(self, "update_enum_value").bind(-1))
-		dialog.connect("popup_hide", Callable(dialog, "queue_free"))
+		dialog.close_requested.connect(dialog.queue_free)
 		dialog.hide()
 		dialog.popup_centered()
 	elif id == ENUM_REMOVE: