diff --git a/app/components/Edit/EditTodoSheet.vue b/app/components/Edit/EditTodoSheet.vue
index 36e2d87..ca99ea5 100644
--- a/app/components/Edit/EditTodoSheet.vue
+++ b/app/components/Edit/EditTodoSheet.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 	import { computed, ref } from "vue";
 	import { useDeleteTodo, useUpdateTodo } from "~/mutations/todo";
-	import type { CreateTodoData, UUID } from "~/utils/types";
+	import type { CreateTodoData } from "~/utils/types";
 	import Sheet from "../Utils/Sheet.vue";
 	import TodoForm from "./TodoForm.vue";
 
 	const isOpen = ref(false);
 
-	const uuid = ref<UUID>("");
+	const uuid = useSelectedTodo();
 	const todoData = ref<CreateTodoData>({
 		title: "",
 		note: "",
@@ -21,13 +21,11 @@
 
 	const showSaveIcon = ref(true);
 
-	const route = useRoute();
 	watch(
-		() => route.query.uuid,
+		uuid,
 		() => {
-			if (!route.query.uuid) return;
+			if (!uuid.value) return;
 
-			uuid.value = route.query.uuid as UUID;
 			const todo = useTodoById(uuid.value);
 			if (!todo) return;
 
@@ -49,7 +47,7 @@
 
 	const { mutate: updateTodo } = useUpdateTodo();
 	async function onSaveTodo() {
-		if (!isValid.value) return;
+		if (!isValid.value || !uuid.value) return;
 
 		updateTodo({ uuid: uuid.value, todoData: todoData.value });
 
@@ -59,22 +57,22 @@
 		}, 1000);
 	}
 
-	const localeRoute = useLocaleRoute();
-
 	async function close() {
 		isOpen.value = false;
-		await navigateTo(localeRoute({ name: "index" }));
+		uuid.value = undefined;
 	}
 
 	const isValid = computed(() => {
-		if (todoData.value.title === "") return false;
+		if (todoData.value.title === "" || !uuid.value) return false;
 
 		return !isTodoSame(todoData.value, uuid.value);
 	});
 
 	const { mutate: deleteTodo } = useDeleteTodo();
 	function onDeleteTodo() {
-		deleteTodo(route.query.uuid as UUID);
+		if (!uuid.value) return;
+
+		deleteTodo(uuid.value);
 		close();
 	}
 </script>
diff --git a/app/components/Nav/OrgSelect.vue b/app/components/Nav/OrgSelect.vue
index b0f9fff..e8bfd46 100644
--- a/app/components/Nav/OrgSelect.vue
+++ b/app/components/Nav/OrgSelect.vue
@@ -12,7 +12,7 @@
 
 	const { data: organizations } = useQuery(useOrganizationsQuery());
 
-	const { selectedOrg } = useSettings();
+	const selectedOrg = useSelectedOrg();
 
 	const open = ref(false);
 
diff --git a/app/components/Todo/TodoShell.vue b/app/components/Todo/TodoShell.vue
index 61afb23..5bd8c28 100644
--- a/app/components/Todo/TodoShell.vue
+++ b/app/components/Todo/TodoShell.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 	import { getTimeRange } from "~/utils/todo";
 	import type { Label as LabelType, Todo } from "~/utils/types";
-
 	import TagLabel from "../Utils/Label/TagLabel.vue";
 	import TasksCounter from "./TasksCounter.vue";
 	import TimeDisplay from "./TimeDisplay/TimeDisplay.vue";
@@ -35,14 +34,11 @@
 		return props.data.category;
 	});
 
-	const localeRoute = useLocaleRoute();
-
+	let selectedTodo = useSelectedTodo();
 	async function onOpenTodo() {
 		if (!props.interactive) return;
 
-		await navigateTo(
-			localeRoute({ name: "index", query: { uuid: props.data.uuid } }),
-		);
+		selectedTodo.value = props.data.uuid;
 	}
 
 	const timeRange = computed(() => {
diff --git a/app/composables/useSSE.ts b/app/composables/useSSE.ts
index b2a34bb..d18e943 100644
--- a/app/composables/useSSE.ts
+++ b/app/composables/useSSE.ts
@@ -47,7 +47,7 @@ export async function AuthSSE(url: string): Promise<SSE> {
 	const {
 		public: { apiBase },
 	} = useRuntimeConfig();
-	const { selectedOrg } = useSettings();
+	const selectedOrg = useSelectedOrg();
 
 	const { getToken } = useAuthToken();
 	const token = await getToken();
diff --git a/app/composables/useSelectedOrg.ts b/app/composables/useSelectedOrg.ts
new file mode 100644
index 0000000..7039a52
--- /dev/null
+++ b/app/composables/useSelectedOrg.ts
@@ -0,0 +1,15 @@
+export function useSelectedOrg() {
+	const route = useRoute();
+	const localeRoute = useLocaleRoute();
+
+	return computed({
+		get: () => {
+			return route.query.org as UUID | undefined;
+		},
+		set: async (value) => {
+			await navigateTo(
+				localeRoute({ name: "index", query: { ...route.query, org: value } }),
+			);
+		},
+	});
+}
diff --git a/app/composables/useSelectedTodo.ts b/app/composables/useSelectedTodo.ts
new file mode 100644
index 0000000..c032187
--- /dev/null
+++ b/app/composables/useSelectedTodo.ts
@@ -0,0 +1,15 @@
+export function useSelectedTodo() {
+	const route = useRoute();
+	const localeRoute = useLocaleRoute();
+
+	return computed({
+		get: () => {
+			return route.query.uuid as UUID | undefined;
+		},
+		set: async (value) => {
+			await navigateTo(
+				localeRoute({ name: "index", query: { ...route.query, uuid: value } }),
+			);
+		},
+	});
+}
diff --git a/app/composables/useSettings.ts b/app/composables/useSettings.ts
index ca69970..b238931 100644
--- a/app/composables/useSettings.ts
+++ b/app/composables/useSettings.ts
@@ -4,7 +4,6 @@ const SettingsSchema = z.object({
 	insertionPoint: z.enum(["top", "bottom"]).default("top"),
 	design: z.enum(["classic", "floating"]).default("classic"),
 	modalSize: z.enum(["md", "lg"]).default("lg"),
-	selectedOrg: z.string().optional(),
 });
 
 export type Settings = z.infer<typeof SettingsSchema>;
@@ -44,7 +43,6 @@ export function useSettings() {
 	const insertionPoint = createBinding(settings, "insertionPoint");
 	const design = createBinding(settings, "design");
 	const modalSize = createBinding(settings, "modalSize");
-	const selectedOrg = createBinding(settings, "selectedOrg");
 
-	return { insertionPoint, design, modalSize, selectedOrg };
+	return { insertionPoint, design, modalSize };
 }
diff --git a/app/pages/index.vue b/app/pages/index.vue
index cd8ac59..fdfd9ee 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -11,7 +11,7 @@
 	const isFilterSheetOpen = ref(false);
 	const isNewSheetOpen = ref(false);
 
-	const { design, selectedOrg } = useSettings();
+	const selectedOrg = useSelectedOrg();
 
 	onMounted(async () => {
 		// Timeout to avoid browser confusing sse as page load progress
@@ -46,6 +46,7 @@
 	});
 
 	const { isMobile } = useDevice();
+	const { design } = useSettings();
 
 	const isPwa = useIsPwa();
 
diff --git a/app/plugins/api.ts b/app/plugins/api.ts
index c4671cc..9a2c210 100644
--- a/app/plugins/api.ts
+++ b/app/plugins/api.ts
@@ -5,7 +5,7 @@ export default defineNuxtPlugin(async () => {
 
 	const { getToken } = useAuthToken();
 
-	const { selectedOrg } = useSettings();
+	const selectedOrg = useSelectedOrg();
 	watch(selectedOrg, () => {
 		const queryCache = useQueryCache();
 		queryCache.invalidateQueries({ key: ["categories"] });