diff --git a/interface/windows/edit/edit.svelte b/interface/windows/edit/edit.svelte
index 1698ab5b..9c1d692c 100644
--- a/interface/windows/edit/edit.svelte
+++ b/interface/windows/edit/edit.svelte
@@ -1,70 +1,13 @@
-<div class="transparent-900 loadSavedCodes m-auto my-20 w-4/5 rounded-2xl p-10 text-left">
-	<h1 class="px-10">Load saved codes</h1>
-	<div class="mx-auto flex flex-col items-center justify-center rounded-2xl p-10">
-		<div class="transparent-800 mb-5 flex w-full flex-row items-center justify-between rounded-xl p-5 text-left">
-			<div>
-				<h2>Loading saved codes</h2>
-				<h3>Load your saved 2FA codes. You can edit or delete your codes, or you can even add new codes here.</h3>
-			</div>
-			<div class="ml-20 flex gap-3">
-				<button class="button" on:click={loadSavedCodes}>
-					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 22c5.523 0 10-4.477 10-10S17.523 2 12 2 2 6.477 2 12s4.477 10 10 10z" /><path d="m9 12 2 2 4-4" /></svg>
-					Confirm
-				</button>
-			</div>
-		</div>
-	</div>
-</div>
-
-<div class="transparent-900 editSavedCodes m-auto my-20 hidden w-4/5 rounded-2xl p-10 text-left">
-	<h1 class="px-10">Edit saved codes</h1>
-	<div class="mx-auto flex flex-col items-center justify-center rounded-2xl p-10">
-		<div class="transparent-800 mb-5 flex w-full flex-row items-center justify-between rounded-xl p-5 text-left">
-			<div>
-				<h2>Save changes</h2>
-				<h3>Save the changes you made. This will overwrite your codes.</h3>
-			</div>
-			<div class="ml-10 flex gap-3">
-				<button class="button" on:click={saveChanges}>
-					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z" /><polyline points="17 21 17 13 7 13 7 21" /><polyline points="7 3 7 8 15 8" /></svg>
-					Save changes
-				</button>
-			</div>
-		</div>
-
-		<div class="transparent-800 mb-5 flex w-full flex-row items-center justify-between rounded-xl p-5 text-left">
-			<div>
-				<h2>Revert changes</h2>
-				<h3>You can revert the current changes you made.</h3>
-			</div>
-			<div class="ml-10 flex gap-3">
-				<button class="button" on:click={revertChanges}>
-					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10" /><line x1="12" y1="8" x2="12" y2="12" /><line x1="12" y1="16" x2="12.01" y2="16" /></svg>
-					Revert changes
-				</button>
-			</div>
-		</div>
-
-		<div class="transparent-800 mb-5 flex w-full flex-row items-center justify-between rounded-xl p-5 text-left">
-			<div>
-				<h2>Delete codes</h2>
-				<h3>You can delete all codes. Be careful, this can not be undone.</h3>
-			</div>
-			<div class="ml-10 flex gap-3">
-				<button class="button" on:click={deleteCodes}>
-					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 6h18" /><path d="M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6" /><path d="M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2" /><line x1="10" y1="11" x2="10" y2="17" /><line x1="14" y1="11" x2="14" y2="17" /></svg>
-					Delete codes
-				</button>
-			</div>
-		</div>
-	</div>
-</div>
-
-<div class="transparent-900 loadedCodes m-auto mb-20 hidden w-4/5 rounded-2xl p-10 text-left">
-	<h1 class="px-10">Loaded codes</h1>
+<div class="transparent-900 loadedCodes m-auto my-20 hidden w-4/5 rounded-2xl p-10 text-left">
+	<h1 class="px-10">Edit codes</h1>
 	<div class="content mx-auto flex flex-col items-center justify-center rounded-2xl p-10" />
 </div>
 
 <script lang="ts">
-	import { deleteCodes, loadSavedCodes, revertChanges, saveChanges } from "./index"
+	import { onMount } from "svelte"
+	import { deleteCodes, loadSavedCodes } from "./index"
+
+	onMount(() => {
+		loadSavedCodes()
+	})
 </script>
diff --git a/interface/windows/edit/index.ts b/interface/windows/edit/index.ts
index 1e0a9d74..7dd4d33a 100644
--- a/interface/windows/edit/index.ts
+++ b/interface/windows/edit/index.ts
@@ -13,9 +13,7 @@ let secrets: string[] = []
  * Generate the edit elements from the saved codes
  */
 const generateEditElements = () => {
-	document.querySelector(".editSavedCodes").style.display = "block"
 	document.querySelector(".loadedCodes").style.display = "block"
-	document.querySelector(".loadSavedCodes").style.display = "none"
 
 	for (let i = 0; i < names.length; i++) {
 		// create div
@@ -69,7 +67,9 @@ export const loadSavedCodes = async () => {
 	const codes = settings.vault.codes
 
 	if (codes === null) {
-		return dialog.message("No save file found. \n\nGo to the codes or the import page and import your codes!", { type: "error" })
+		await dialog.message("No save file found. \n\nGo to the codes or the import page and import your codes!", { type: "error" })
+
+		return navigate("import")
 	}
 
 	const decryptedText = await decryptData(codes)
@@ -86,12 +86,6 @@ export const loadSavedCodes = async () => {
  * Save the current changes
  */
 export const saveChanges = async () => {
-	const confirm = await dialog.ask("Are you sure you want to save the changes? \n\nThis will overwrite your saved codes!", { type: "warning" })
-
-	if (confirm === false) {
-		return
-	}
-
 	let saveText = ""
 
 	for (let i = 0; i < names.length; i++) {
@@ -103,21 +97,6 @@ export const saveChanges = async () => {
 
 	settings.vault.codes = encryptedText
 	setSettings(settings)
-
-	navigate("codes")
-}
-
-/**
- * Revert all current changes
- */
-export const revertChanges = async () => {
-	const confirm = await dialog.ask("Are you sure you want to revert all changes? \n\nYou will lose all current changes!", { type: "warning" })
-
-	if (confirm === false) {
-		return
-	}
-
-	location.reload()
 }
 
 /**
@@ -143,7 +122,7 @@ export const deleteCodes = async () => {
 /**
  * Edit a specific code
  */
-export const editCode = (id: number) => {
+export const editCode = async (id: number) => {
 	const issuer: HTMLInputElement = document.querySelector(`#issuer${id}`)
 	const name: HTMLInputElement = document.querySelector(`#name${id}`)
 
@@ -167,10 +146,17 @@ export const editCode = (id: number) => {
 		const newIssuer = document.querySelector(`#issuer${id}`).value
 		const newName = document.querySelector(`#name${id}`).value
 
-		issuers[id] = newIssuer
-		names[id] = newName
+		const res = await dialog.ask("Do you want to save your changes?", { type: "warning" })
 
-		dialog.message("Code edited. \n\nYou can save or revert this change at the top of the page.")
+		if (res === true) {
+			issuers[id] = newIssuer
+			names[id] = newName
+
+			saveChanges()
+		} else {
+			issuer.value = issuers[id]
+			name.value = names[id]
+		}
 	}
 }
 
@@ -178,7 +164,7 @@ export const editCode = (id: number) => {
  * Delete a specific code
  */
 export const deleteCode = async (id: number) => {
-	const res = await dialog.ask("Are you sure you want to delete this code? \n\nYou can save or revert this change at the top of the page.", { type: "warning" })
+	const res = await dialog.ask("Are you sure you want to delete this code? \n\nYou can not revert this.", { type: "warning" })
 
 	if (res === true) {
 		names.splice(id, 1)
@@ -186,5 +172,7 @@ export const deleteCode = async (id: number) => {
 		issuers.splice(id, 1)
 
 		document.querySelector(`#edit${id}`).remove()
+
+		saveChanges()
 	}
 }
diff --git a/interface/windows/settings/settings.svelte b/interface/windows/settings/settings.svelte
index ca2ceec9..8ac88ab6 100644
--- a/interface/windows/settings/settings.svelte
+++ b/interface/windows/settings/settings.svelte
@@ -61,6 +61,19 @@
 	<h1 class="px-10">Codes</h1>
 
 	<div class="mx-auto flex flex-col items-center justify-center rounded-2xl p-10">
+		<div class="transparent-800 mb-5 flex w-full flex-row items-center justify-between rounded-xl p-5 text-left">
+			<div>
+				<h2>Delete codes</h2>
+				<h3>You can delete all codes. Be careful, this can not be undone.</h3>
+			</div>
+			<div class="ml-20 flex gap-3">
+				<button class="button" on:click={deleteCodes}>
+					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 6h18" /><path d="M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6" /><path d="M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2" /><line x1="10" y1="11" x2="10" y2="17" /><line x1="14" y1="11" x2="14" y2="17" /></svg>
+					Delete codes
+				</button>
+			</div>
+		</div>
+
 		<div class="transparent-800 mb-5 flex w-full flex-row items-center justify-between rounded-xl p-5 text-left">
 			<div>
 				<h2>Codes description</h2>
@@ -190,6 +203,7 @@
 	import { settings } from "../../stores/settings"
 	import { open } from "../../utils/navigate"
 	import { deleteShortcut, editShortcut, resetShortcut, shortcuts } from "../../utils/shortcuts"
+	import { deleteCodes } from "../edit/index"
 
 	$: windowCapture = false
 </script>