diff --git a/assets/js/components/Config/LoadpointModal.vue b/assets/js/components/Config/LoadpointModal.vue
index 049c391a3..d0c062b90 100644
--- a/assets/js/components/Config/LoadpointModal.vue
+++ b/assets/js/components/Config/LoadpointModal.vue
@@ -1,12 +1,13 @@
 <template>
 	<GenericModal
 		id="loadpointModal"
+		ref="modal"
 		:title="modalTitle"
 		data-testid="loadpoint-modal"
 		:fade="fade"
-		@open="open"
-		@opened="opened"
-		@close="close"
+		@open="onOpen"
+		@opened="onOpened"
+		@close="onClose"
 	>
 		<form ref="form" class="container mx-0 px-0" @submit.prevent="isNew ? create() : update()">
 			<FormRow
@@ -600,7 +601,7 @@ export default {
 		meters: { type: Array, default: () => [] },
 		circuits: { type: Array, default: () => [] },
 	},
-	emits: ["updated", "openMeterModal", "openChargerModal", "close", "opened"],
+	emits: ["updated", "openMeterModal", "openChargerModal", "opened"],
 	data() {
 		return {
 			isModalVisible: false,
@@ -771,17 +772,19 @@ export default {
 			}
 			this.saving = false;
 		},
-		open() {
+		onOpen() {
 			this.isModalVisible = true;
 		},
-		opened() {
+		onOpened() {
 			this.$emit("opened");
 		},
-		close() {
-			this.$emit("close");
+		onClose() {
 			this.showAllSelected = false;
 			this.isModalVisible = false;
 		},
+		close() {
+			this.$refs.modal.close();
+		},
 		editCharger() {
 			this.$emit("openChargerModal", this.values.charger);
 		},