diff --git a/src/Autoload/Global.gd b/src/Autoload/Global.gd
index 7ea5794bb..5f8a39bcc 100644
--- a/src/Autoload/Global.gd
+++ b/src/Autoload/Global.gd
@@ -554,7 +554,7 @@ func layers_changed(value : Array) -> void:
 	for i in range(layers.size() - 1, -1, -1):
 		var layer_container = load("res://src/UI/Timeline/LayerButton.tscn").instance()
 		layer_container.i = i
-		if !layers[i].name:
+		if layers[i].name == tr("Layer") + " 0":
 			layers[i].name = tr("Layer") + " %s" % i
 
 		layers_container.add_child(layer_container)
diff --git a/src/Canvas.gd b/src/Canvas.gd
index eaa8c49f2..3ae589470 100644
--- a/src/Canvas.gd
+++ b/src/Canvas.gd
@@ -56,8 +56,8 @@ func _ready() -> void:
 		if self in l.linked_cels:
 			# If the linked button is pressed, set as the Image & ImageTexture
 			# to be the same as the first linked cel
-			layers[layer_i][0] = l[5][0].layers[layer_i][0]
-			layers[layer_i][1] = l[5][0].layers[layer_i][1]
+			layers[layer_i][0] = l.linked_cels[0].layers[layer_i][0]
+			layers[layer_i][1] = l.linked_cels[0].layers[layer_i][1]
 
 		layer_i += 1