diff --git a/Scripts/Canvas.gd b/Scripts/Canvas.gd
index 136ea5097..6ce894b3a 100644
--- a/Scripts/Canvas.gd
+++ b/Scripts/Canvas.gd
@@ -53,6 +53,11 @@ func _ready() -> void:
 			# Store [Image, ImageTexture, Opacity]
 			layers.append([sprite, tex, 1])
 
+		if self in l[5]:
+			var current_layer := layers.size() - 1
+			layers[current_layer][0] = l[5][0].layers[current_layer][0]
+			layers[current_layer][1] = l[5][0].layers[current_layer][1]
+
 	# Only handle camera zoom settings & offset on the first frame
 	if Global.canvases[0] == self:
 		camera_zoom()
diff --git a/Scripts/FrameButton.gd b/Scripts/FrameButton.gd
index e24b38f90..22ca165b1 100644
--- a/Scripts/FrameButton.gd
+++ b/Scripts/FrameButton.gd
@@ -70,7 +70,7 @@ func _on_PopupMenu_id_pressed(ID : int) -> void:
 			Global.undo_redo.add_do_property(Global, "canvas", new_canvas)
 			Global.undo_redo.add_do_property(Global, "current_frame", new_canvases.size() - 1)
 			for i in range(Global.layers.size()):
-				for child in Global.layers[i][2].get_children():
+				for child in Global.layers[i][3].get_children():
 					Global.undo_redo.add_do_property(child, "pressed", false)
 					Global.undo_redo.add_undo_property(child, "pressed", child.pressed)
 			for c in Global.canvases: