diff --git a/sources/menus/settings/teacher_settings.gd b/sources/menus/settings/teacher_settings.gd
index 529ee32c..c2f3d400 100644
--- a/sources/menus/settings/teacher_settings.gd
+++ b/sources/menus/settings/teacher_settings.gd
@@ -91,9 +91,9 @@ func refresh_devices_tabs() -> void:
 	for device: int in UserDataManager.teacher_settings.students.keys():
 		var device_tab: DeviceTab
 		device_tab = DEVICE_TAB_SCENE.instantiate()
+		device_tab.device_id = device
 		devices_tab_container.add_child(device_tab)
 		await get_tree().process_frame # Not optional or an auto-rename bug will occur on the tabs (especiallly if there are a lot of them)
-		device_tab.device_id = device
 		(device_tab as DeviceTab).students = UserDataManager.teacher_settings.students[device] as Array[StudentData]
 		device_tab.name = tr("DEVICE_NUMBER").format({"number": device})
 		device_tab.student_pressed.connect(_on_student_pressed)