diff --git a/addons/resources_spreadsheet_view/main_screen/input_handler.gd b/addons/resources_spreadsheet_view/main_screen/input_handler.gd
index 2667759..20e4c20 100644
--- a/addons/resources_spreadsheet_view/main_screen/input_handler.gd
+++ b/addons/resources_spreadsheet_view/main_screen/input_handler.gd
@@ -41,7 +41,7 @@ func _gui_input(event : InputEvent):
 	if event is InputEventMouseButton:
 		if event.button_index != MOUSE_BUTTON_LEFT:
 			if event.button_index == MOUSE_BUTTON_RIGHT && event.is_pressed():
-				editor_view.cells_context.emit(selection.edited_cells)
+				selection.rightclick_cells()
 
 			return
 
diff --git a/addons/resources_spreadsheet_view/main_screen/selection_actions.gd b/addons/resources_spreadsheet_view/main_screen/selection_actions.gd
index 3ff1022..0b62edd 100644
--- a/addons/resources_spreadsheet_view/main_screen/selection_actions.gd
+++ b/addons/resources_spreadsheet_view/main_screen/selection_actions.gd
@@ -11,8 +11,8 @@ enum {
 @export @onready var selection := $"../../SelectionManager"
 
 @onready var editbox_node := $"Control/ColorRect/Popup"
-@onready var editbox_label := editbox_node.get_node("Panel/VBoxContainer/Label")
-@onready var editbox_input := editbox_node.get_node("Panel/VBoxContainer/LineEdit")
+@onready var editbox_label : Label = editbox_node.get_node("Panel/VBoxContainer/Label")
+@onready var editbox_input : LineEdit = editbox_node.get_node("Panel/VBoxContainer/LineEdit")
 
 var cell : Control
 var editbox_action : int
@@ -23,6 +23,7 @@ func _ready():
 		"panel",
 		get_theme_stylebox(&"Content", &"EditorStyles")
 	)
+	editbox_input.text_submitted.connect(func(_new_text): _on_editbox_accepted())
 	close()
 
 
@@ -47,18 +48,18 @@ func open(cells : Array, pin_to_cell : bool = false):
 	
 	if pin_to_cell:
 		cell = cells[-1]
-		global_position = Vector2(
+		set_deferred(&"global_position", Vector2(
 			cell.global_position.x + cell.size.x,
 			cell.global_position.y
-		)
+		))
 
 	else:
 		cell = null
-		global_position = get_global_mouse_position() + Vector2.ONE
+		set_deferred(&"global_position", get_global_mouse_position() + Vector2.ONE)
 
+	show()
 	size = Vector2.ZERO
 	top_level = true
-	show()
 	$"Control2/Label".text = str(cells.size()) + (" Cells" if cells.size() % 10 != 1 else " Cell")
 	$"GridContainer/Rename".visible = editor_view.has_row_names()