diff --git a/Scripts/Canvas.gd b/Scripts/Canvas.gd
index 82ef540a0..1dd79d455 100644
--- a/Scripts/Canvas.gd
+++ b/Scripts/Canvas.gd
@@ -465,10 +465,10 @@ func handle_undo(action : String) -> void:
 	for c in canvases:
 		# I'm not sure why I have to unlock it, but...
 		# ...if I don't, it doesn't work properly
-		c.layers[c.current_layer_index][0].unlock()
-		var data = c.layers[c.current_layer_index][0].data
-		c.layers[c.current_layer_index][0].lock()
-		Global.undo_redo.add_undo_property(c.layers[c.current_layer_index][0], "data", data)
+		c.layers[Global.current_layer][0].unlock()
+		var data = c.layers[Global.current_layer][0].data
+		c.layers[Global.current_layer][0].lock()
+		Global.undo_redo.add_undo_property(c.layers[Global.current_layer][0], "data", data)
 	if action == "Rectangle Select":
 		var selected_pixels = Global.selected_pixels.duplicate()
 		Global.undo_redo.add_undo_property(Global.selection_rectangle, "polygon", Global.selection_rectangle.polygon)
@@ -486,11 +486,11 @@ func handle_redo(action : String) -> void:
 	var layer_index := -1
 	if Global.animation_timer.is_stopped():
 		canvases = [self]
-		layer_index = current_layer_index
+		layer_index = Global.current_layer
 	else:
 		canvases = Global.canvases
 	for c in canvases:
-		Global.undo_redo.add_do_property(c.layers[c.current_layer_index][0], "data", c.layers[c.current_layer_index][0].data)
+		Global.undo_redo.add_do_property(c.layers[Global.current_layer][0], "data", c.layers[Global.current_layer][0].data)
 	if action == "Rectangle Select":
 		Global.undo_redo.add_do_property(Global.selection_rectangle, "polygon", Global.selection_rectangle.polygon)
 		Global.undo_redo.add_do_property(Global, "selected_pixels", Global.selected_pixels)
diff --git a/Scripts/Dialogs/OutlineDialog.gd b/Scripts/Dialogs/OutlineDialog.gd
index e2b5def35..1711b2789 100644
--- a/Scripts/Dialogs/OutlineDialog.gd
+++ b/Scripts/Dialogs/OutlineDialog.gd
@@ -9,7 +9,7 @@ func _on_OutlineDialog_confirmed() -> void:
 	var diagonal : bool = $OptionsContainer/DiagonalCheckBox.pressed
 	var inside_image : bool = $OptionsContainer/InsideImageCheckBox.pressed
 
-	var image : Image = Global.canvas.layers[Global.canvas.current_layer_index][0]
+	var image : Image = Global.canvas.layers[Global.current_layer][0]
 	if image.is_invisible():
 		return
 	var new_image := Image.new()
diff --git a/Scripts/Main.gd b/Scripts/Main.gd
index 4b7d3017c..2e860bd7a 100644
--- a/Scripts/Main.gd
+++ b/Scripts/Main.gd
@@ -332,23 +332,23 @@ func image_menu_id_pressed(id : int) -> void:
 		2: # Flip Horizontal
 			var canvas : Canvas = Global.canvas
 			canvas.handle_undo("Draw")
-			canvas.layers[canvas.current_layer_index][0].unlock()
-			canvas.layers[canvas.current_layer_index][0].flip_x()
-			canvas.layers[canvas.current_layer_index][0].lock()
+			canvas.layers[Global.current_layer][0].unlock()
+			canvas.layers[Global.current_layer][0].flip_x()
+			canvas.layers[Global.current_layer][0].lock()
 			canvas.handle_redo("Draw")
 		3: # Flip Vertical
 			var canvas : Canvas = Global.canvas
 			canvas.handle_undo("Draw")
-			canvas.layers[canvas.current_layer_index][0].unlock()
-			canvas.layers[canvas.current_layer_index][0].flip_y()
-			canvas.layers[canvas.current_layer_index][0].lock()
+			canvas.layers[Global.current_layer][0].unlock()
+			canvas.layers[Global.current_layer][0].flip_y()
+			canvas.layers[Global.current_layer][0].lock()
 			canvas.handle_redo("Draw")
 		4: # Rotate
-			var image : Image = Global.canvas.layers[Global.canvas.current_layer_index][0]
+			var image : Image = Global.canvas.layers[Global.current_layer][0]
 			$RotateImage.set_sprite(image)
 			$RotateImage.popup_centered()
 		5: # Invert Colors
-			var image : Image = Global.canvas.layers[Global.canvas.current_layer_index][0]
+			var image : Image = Global.canvas.layers[Global.current_layer][0]
 			Global.canvas.handle_undo("Draw")
 			for xx in image.get_size().x:
 				for yy in image.get_size().y:
@@ -358,7 +358,7 @@ func image_menu_id_pressed(id : int) -> void:
 					image.set_pixel(xx, yy, px_color)
 			Global.canvas.handle_redo("Draw")
 		6: # Desaturation
-			var image : Image = Global.canvas.layers[Global.canvas.current_layer_index][0]
+			var image : Image = Global.canvas.layers[Global.current_layer][0]
 			Global.canvas.handle_undo("Draw")
 			for xx in image.get_size().x:
 				for yy in image.get_size().y:
@@ -775,7 +775,7 @@ func _on_RightVerticalMirroring_toggled(button_pressed) -> void:
 	Global.right_vertical_mirror = button_pressed
 
 func _on_OpacitySlider_value_changed(value) -> void:
-	Global.canvas.layers[Global.canvas.current_layer_index][4] = value / 100
+	Global.canvas.layers[Global.current_layer][4] = value / 100
 	Global.layer_opacity_slider.value = value
 	Global.layer_opacity_spinbox.value = value
 	Global.canvas.update()