diff --git a/src/components/item/CreateShortcutModal.vue b/src/components/item/CreateShortcutModal.vue
index f55fd58..776cae6 100644
--- a/src/components/item/CreateShortcutModal.vue
+++ b/src/components/item/CreateShortcutModal.vue
@@ -48,6 +48,31 @@
 				</svg>
 			</div>
 
+			<!-- Loading -->
+			<div
+				v-else-if="!hasLoadedFolders"
+				class="group relative inline-flex w-full select-none items-center justify-center rounded-lg py-1 text-white"
+			>
+				<div role="status">
+					<svg
+						aria-hidden="true"
+						class="mr-2 h-8 w-8 animate-spin fill-primary-600 text-gray-200 dark:text-gray-600"
+						viewBox="0 0 100 101"
+						fill="none"
+						xmlns="http://www.w3.org/2000/svg"
+					>
+						<path
+							d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+							fill="currentColor"
+						/>
+						<path
+							d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+							fill="currentFill"
+						/>
+					</svg>
+				</div>
+			</div>
+
 			<!-- No Folders -->
 			<div
 				v-else-if="folders.length === 0"
@@ -99,7 +124,7 @@ import { ShortcutClass } from '@lib/items/shortcuts';
 import BaseModal from '@components/base/modal.vue';
 import BaseButton, { ButtonColor } from '@components/base/button.vue';
 import { t } from '@lib/i18n';
-import { api } from '@lib/helpers';
+import { fetchFromApi } from '@lib/helpers';
 import { ItemFactory } from '@lib/items/factory';
 import { ItemClass } from '@lib/items/items';
 import { addToast } from '@stores/toasts';
@@ -108,6 +133,8 @@ import { ToastType } from '@components/base/toast.vue';
 const HOME_FOLDER_PARENT_ID = -1 as const;
 const HOME_FOLDER_ID = null;
 
+const hasLoadedFolders = ref(false);
+
 const props = defineProps({
 	item: {
 		type: Object as PropType<ItemClass>,
@@ -167,6 +194,8 @@ const parentFolder = ref<{ id: number | null; name: string; parentId: number | n
 setFolders(HOME_FOLDER_PARENT_ID);
 
 async function setFolders(folderId: number | null) {
+	hasLoadedFolders.value = false;
+
 	if (folderId === HOME_FOLDER_PARENT_ID) {
 		parentFolder.value = null;
 		folders.value = [];
@@ -200,10 +229,8 @@ async function getFolders() {
 			return;
 		}
 
-		console.log(parentFolder.value);
-
-		const response = await fetch(
-			api(`item/${parentFolder.value.id ? `${parentFolder.value.id}` : ''}`),
+		const response = await fetchFromApi(
+			`item/${parentFolder.value.id ? `${parentFolder.value.id}` : ''}`,
 			{
 				method: 'GET',
 				headers: {
@@ -232,8 +259,16 @@ async function getFolders() {
 
 			if (!FolderClass.isFolder(item)) continue;
 
+			if (item.parentId !== parentFolder.value.id) {
+				throw new Error(
+					"Invalid parent id, user must've changed the parent folder before the request finished",
+				);
+			}
+
 			folders.value.push(item);
 		}
+
+		hasLoadedFolders.value = true;
 	} catch (e) {
 		console.error('Error' + e);
 	}
diff --git a/src/lib/items/docs.ts b/src/lib/items/docs.ts
index 3bce554..5e9dc59 100644
--- a/src/lib/items/docs.ts
+++ b/src/lib/items/docs.ts
@@ -1,6 +1,6 @@
 import { ItemClass, type ItemType } from './items';
 import { type FolderType } from './folders';
-import { api, fetchFromApi } from '@lib/helpers';
+import { fetchFromApi } from '@lib/helpers';
 
 export class DocsClass extends ItemClass {
 	private _text: string;
diff --git a/src/lib/items/shortcuts.ts b/src/lib/items/shortcuts.ts
index edef778..3c3f21a 100644
--- a/src/lib/items/shortcuts.ts
+++ b/src/lib/items/shortcuts.ts
@@ -1,4 +1,4 @@
-import { api, fetchFromApi } from '@lib/helpers';
+import { fetchFromApi } from '@lib/helpers';
 import { ItemClass, type ItemType } from './items';
 import { FolderClass } from './folders';
 import { FileClass } from './files';
@@ -15,7 +15,7 @@ export class ShortcutClass extends ItemClass {
 	}
 
 	async setLinkedItem(linkedItemId: number) {
-		const response = await fetch(api('item/' + linkedItemId + '/single'), {
+		const response = await fetchFromApi('item/' + linkedItemId + '/single', {
 			method: 'GET',
 			headers: {
 				'Content-Type': 'application/json',
@@ -41,7 +41,7 @@ export class ShortcutClass extends ItemClass {
 	}
 
 	static async create(input: { name: string; parentId: number | null; linkedItemId: number }) {
-		const response = await fetch(api('shortcut'), {
+		const response = await fetchFromApi('shortcut', {
 			method: 'POST',
 			headers: {
 				'Content-Type': 'application/json',
@@ -94,7 +94,7 @@ export class ShortcutClass extends ItemClass {
 	}
 
 	async delete() {
-		const response = await fetch(api('shortcut/' + this.id), {
+		const response = await fetchFromApi('shortcut/' + this.id, {
 			method: 'DELETE',
 			headers: {
 				'Content-Type': 'application/json',