diff --git a/project.godot b/project.godot
index b6b1029f4..b761261d6 100644
--- a/project.godot
+++ b/project.godot
@@ -534,6 +534,17 @@ right_magic_wand_tool={
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":true,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":81,"unicode":0,"echo":false,"script":null)
  ]
 }
+enter={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777222,"unicode":0,"echo":false,"script":null)
+ ]
+}
+escape={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null)
+ ]
+}
 
 [locale]
 
diff --git a/src/UI/Canvas/Selection.gd b/src/UI/Canvas/Selection.gd
index 1e0b5eb3b..19c75ed7b 100644
--- a/src/UI/Canvas/Selection.gd
+++ b/src/UI/Canvas/Selection.gd
@@ -78,10 +78,10 @@ func _ready() -> void:
 
 func _input(event : InputEvent) -> void:
 	if event is InputEventKey:
-		if is_moving_content: # Temporary code
-			if event.scancode == 16777221: # Enter
+		if is_moving_content:
+			if Input.is_action_just_pressed("enter"):
 				transform_content_confirm()
-			elif event.scancode == 16777217: # Escape
+			elif Input.is_action_just_pressed("escape"):
 				transform_content_cancel()
 	elif event is InputEventMouse:
 		var gizmo : Gizmo