diff --git a/lib/Service/ContextService.php b/lib/Service/ContextService.php
index 10937a1495..802779ae88 100644
--- a/lib/Service/ContextService.php
+++ b/lib/Service/ContextService.php
@@ -5,6 +5,7 @@
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\Tables\Service;
 
 use InvalidArgumentException;
@@ -237,6 +238,56 @@ public function update(int $contextId, string $userId, ?string $name, ?string $i
 				$currentPages[$updatedContent->getPageId()]['content'][$updatedContent->getId()] = $updatedContent->jsonSerialize();
 			}
 			unset($nodesBeingAdded);
+
+			// Update order of nodes
+			$startPageId = null;
+			foreach ($currentPages as $page) {
+				if ($page['page_type'] === Page::TYPE_STARTPAGE) {
+					$startPageId = $page['id'];
+					break;
+				}
+			}
+
+			if ($startPageId !== null && isset($currentPages[$startPageId]['content'])) {
+				$nodeTypeIdToRelId = [];
+				foreach ($currentNodes as $relId => $nodeData) {
+					$key = sprintf('t%di%d', $nodeData['node_type'], $nodeData['node_id']);
+					$nodeTypeIdToRelId[$key] = $relId;
+				}
+
+				$relIdToContentId = [];
+				foreach ($currentPages[$startPageId]['content'] as $contentId => $content) {
+					$relIdToContentId[$content['node_rel_id']] = $contentId;
+				}
+
+				$contentsToUpdate = [];
+				foreach ($nodes as $index => $node) {
+					$key = sprintf('t%di%d', $node['type'], $node['id']);
+					if (isset($nodeTypeIdToRelId[$key])) {
+						$relId = $nodeTypeIdToRelId[$key];
+						if (isset($relIdToContentId[$relId])) {
+							$contentId = $relIdToContentId[$relId];
+							$newOrder = ($index + 1) * 10;
+
+							// Optimistic check: if order is already correct in memory, we might skip?
+							// However, simpler to just add to update list, updateContentOrder should handle exceptions.
+							// But to avoid DB writes if nothing changed:
+							if ($currentPages[$startPageId]['content'][$contentId]['order'] !== $newOrder) {
+								$contentsToUpdate[] = [
+									'id' => $contentId,
+									'order' => $newOrder
+								];
+								$currentPages[$startPageId]['content'][$contentId]['order'] = $newOrder;
+								$hasUpdatedNodeInformation = true;
+							}
+						}
+					}
+				}
+
+				if (!empty($contentsToUpdate)) {
+					$this->updateContentOrder($startPageId, $contentsToUpdate);
+				}
+			}
 		}
 
 		$context = $this->contextMapper->update($context);
@@ -305,8 +356,10 @@ public function transfer(int $contextId, string $newOwnerId, int $newOwnerType):
 		$context = $this->contextMapper->update($context);
 
 		$auditEvent = new CriticalActionPerformedEvent(
-			sprintf('Tables application with ID %d was transferred to user %s',
-				$contextId, $newOwnerId,
+			sprintf(
+				'Tables application with ID %d was transferred to user %s',
+				$contextId,
+				$newOwnerId,
 			)
 		);
 
diff --git a/src/modules/modals/EditContext.vue b/src/modules/modals/EditContext.vue
index 6c74f0007a..be2d200b76 100644
--- a/src/modules/modals/EditContext.vue
+++ b/src/modules/modals/EditContext.vue
@@ -3,10 +3,7 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<NcDialog v-if="showModal"
-		:name="t('tables', 'Edit application')"
-		size="normal"
-		data-cy="editContextModal"
+	<NcDialog v-if="showModal" :name="t('tables', 'Edit application')" size="normal" data-cy="editContextModal"
 		@closing="actionCancel">
 		<div class="modal__content" data-cy="editContextModal">
 			<div class="row">
@@ -30,7 +27,8 @@
 				<div class="col-4">
 					{{ t('tables', 'Description') }}
 				</div>
-				<input v-model="description" type="text" data-cy="editContextDes" :placeholder="t('tables', 'Description of the application')">
+				<input v-model="description" type="text" data-cy="editContextDes"
+					:placeholder="t('tables', 'Description of the application')">
 			</div>
 			<div class="col-4 row space-T">
 				<div class="col-4">
@@ -55,7 +53,8 @@
 						{{ t('tables', 'I really want to delete this application!') }}
 					</NcButton>
 					<div class="right-additional-button">
-						<NcButton v-if="ownsContext(localContext)" data-cy="transferContextSubmitBtn" @click="actionTransfer">
+						<NcButton v-if="ownsContext(localContext)" data-cy="transferContextSubmitBtn"
+							@click="actionTransfer">
 							{{ t('tables', 'Transfer application') }}
 						</NcButton>
 						<NcButton type="primary" data-cy="editContextSubmitBtn" @click="submit">
@@ -232,24 +231,35 @@ export default {
 		},
 		getContextResources(context) {
 			const resources = []
-			const nodes = Object.values(context.nodes)
-			for (const node of nodes) {
-				if (parseInt(node.node_type) === NODE_TYPE_TABLE || parseInt(node.node_type) === NODE_TYPE_VIEW) {
-					const element = parseInt(node.node_type) === NODE_TYPE_TABLE ? this.tables.find(t => t.id === node.node_id) : this.views.find(v => v.id === node.node_id)
-					if (element) {
-						const elementKey = parseInt(node.node_type) === NODE_TYPE_TABLE ? 'table-' : 'view-'
-						const resource = {
-							title: element.title,
-							emoji: element.emoji,
-							key: `${elementKey}` + element.id,
-							nodeType: parseInt(node.node_type) === NODE_TYPE_TABLE ? NODE_TYPE_TABLE : NODE_TYPE_VIEW,
-							id: (element.id).toString(),
-							permissionRead: this.getPermissionFromBitmask(node.permissions, PERMISSION_READ),
-							permissionCreate: this.getPermissionFromBitmask(node.permissions, PERMISSION_CREATE),
-							permissionUpdate: this.getPermissionFromBitmask(node.permissions, PERMISSION_UPDATE),
-							permissionDelete: this.getPermissionFromBitmask(node.permissions, PERMISSION_DELETE),
+			if (context && context.pages) {
+				const pages = Object.values(context.pages)
+				const startPage = pages.find(p => p.page_type === 'startpage')
+
+				if (startPage && startPage.content) {
+					const sortedContent = Object.values(startPage.content).sort((a, b) => a.order - b.order)
+
+					for (const content of sortedContent) {
+						const node = context.nodes[content.node_rel_id]
+						if (!node) continue
+
+						if (parseInt(node.node_type) === NODE_TYPE_TABLE || parseInt(node.node_type) === NODE_TYPE_VIEW) {
+							const element = parseInt(node.node_type) === NODE_TYPE_TABLE ? this.tables.find(t => t.id === node.node_id) : this.views.find(v => v.id === node.node_id)
+							if (element) {
+								const elementKey = parseInt(node.node_type) === NODE_TYPE_TABLE ? 'table-' : 'view-'
+								const resource = {
+									title: element.title,
+									emoji: element.emoji,
+									key: `${elementKey}` + element.id,
+									nodeType: parseInt(node.node_type) === NODE_TYPE_TABLE ? NODE_TYPE_TABLE : NODE_TYPE_VIEW,
+									id: (element.id).toString(),
+									permissionRead: this.getPermissionFromBitmask(node.permissions, PERMISSION_READ),
+									permissionCreate: this.getPermissionFromBitmask(node.permissions, PERMISSION_CREATE),
+									permissionUpdate: this.getPermissionFromBitmask(node.permissions, PERMISSION_UPDATE),
+									permissionDelete: this.getPermissionFromBitmask(node.permissions, PERMISSION_DELETE),
+								}
+								resources.push(resource)
+							}
 						}
-						resources.push(resource)
 					}
 				}
 			}
diff --git a/src/pages/Context.vue b/src/pages/Context.vue
index b2ce209ddd..16ea141c0a 100644
--- a/src/pages/Context.vue
+++ b/src/pages/Context.vue
@@ -165,46 +165,62 @@ export default {
 
 				this.icon = await this.getContextIcon(this.activeContext.iconName)
 
-				if (this.context && this.context.nodes) {
-					for (const [, node] of Object.entries(this.context.nodes)) {
-						try {
-							const nodeType = parseInt(node.node_type)
-							if (nodeType === NODE_TYPE_TABLE) {
-								const table = this.tables.find(table => table.id === node.node_id)
-								if (table) {
-									await this.loadColumnsFromBE({
-										view: null,
-										tableId: table.id,
-									})
-									await this.loadRowsFromBE({
-										viewId: null,
-										tableId: table.id,
-									})
-									table.key = (table.id).toString()
-									table.isView = false
-									this.contextResources.push(table)
-								}
+				this.icon = await this.getContextIcon(this.activeContext.iconName)
+
+				if (this.context && this.context.pages) {
+					const pages = Object.values(this.context.pages)
+					const startPage = pages.find(p => p.page_type === 'startpage')
+
+					if (startPage && startPage.content) {
+						const sortedContent = Object.values(startPage.content).sort((a, b) => a.order - b.order)
+
+						for (const content of sortedContent) {
+							const node = this.context.nodes[content.node_rel_id]
+							if (!node) continue
+
+							try {
+								const nodeType = parseInt(node.node_type)
+								if (nodeType === NODE_TYPE_TABLE) {
+									const table = this.tables.find(table => table.id === node.node_id)
+									if (table) {
+										await this.loadColumnsFromBE({
+											view: null,
+											tableId: table.id,
+										})
+										await this.loadRowsFromBE({
+											viewId: null,
+											tableId: table.id,
+										})
+										table.key = (table.id).toString()
+										table.isView = false
+										this.contextResources.push(table)
+									}
 
-							} else if (nodeType === NODE_TYPE_VIEW) {
-								const view = this.views.find(view => view.id === node.node_id)
-								if (view) {
-									await this.loadColumnsFromBE({
-										view,
-									})
-									await this.loadRowsFromBE({
-										viewId: view.id,
-										tableId: view.tableId,
-									})
-									view.key = 'view-' + (view.id).toString()
-									view.isView = true
-									this.contextResources.push(view)
+								} else if (nodeType === NODE_TYPE_VIEW) {
+									const view = this.views.find(view => view.id === node.node_id)
+									if (view) {
+										await this.loadColumnsFromBE({
+											view,
+										})
+										await this.loadRowsFromBE({
+											viewId: view.id,
+											tableId: view.tableId,
+										})
+										view.key = 'view-' + (view.id).toString()
+										view.isView = true
+										this.contextResources.push(view)
+									}
 								}
+							} catch (err) {
+								console.error(`Failed to load resource ${node.node_id}:`, err)
+								this.errorMessage = t('tables', 'Some resources in this application could not be loaded')
 							}
-						} catch (err) {
-							console.error(`Failed to load resource ${node.node_id}:`, err)
-							this.errorMessage = t('tables', 'Some resources in this application could not be loaded')
 						}
 					}
+					// TODO: check this
+					// Fallback if no startpage or content (though unexpected for valid contexts with nodes)
+					// If nodes exist but not in startpage content, they won't be shown.
+					// This matches backend logic where nodes are added to startpage.
 				}
 			} catch (e) {
 				if (e.message === 'NOT_FOUND') {
diff --git a/src/shared/components/ncContextResource/NcContextResource.vue b/src/shared/components/ncContextResource/NcContextResource.vue
index 6c6aafb723..87bd145b7b 100644
--- a/src/shared/components/ncContextResource/NcContextResource.vue
+++ b/src/shared/components/ncContextResource/NcContextResource.vue
@@ -6,9 +6,12 @@
 	<div>
 		<div>
 			<ResourceForm :resources="localResources" data-cy="contextResourceForm" @add="addResource" />
-			<ResourceList :resources="localResources" data-cy="contextResourceList" @remove="removeResource" />
-			<ResourceSharees :select-users="true" :select-groups="true" :receivers="localReceivers" data-cy="contextResourceShare" @update="updateReceivers" />
-			<ResourceSharePermissions :resources="localResources" data-cy="contextResourcePerms" @update="updateResourcePermissions" />
+			<ResourceList :resources="localResources" data-cy="contextResourceList" @remove="removeResource"
+				@update:resources="updateOrder" />
+			<ResourceSharees :select-users="true" :select-groups="true" :receivers="localReceivers"
+				data-cy="contextResourceShare" @update="updateReceivers" />
+			<ResourceSharePermissions :resources="localResources" data-cy="contextResourcePerms"
+				@update="updateResourcePermissions" />
 		</div>
 	</div>
 </template>
@@ -83,6 +86,10 @@ export default {
 			this.contextResources.push(resource)
 			this.localResources = this.contextResources
 		},
+		updateOrder(resources) {
+			this.contextResources = resources
+			this.localResources = this.contextResources
+		},
 		updateReceivers(receivers) {
 			this.localReceivers = receivers
 		},
diff --git a/src/shared/components/ncContextResource/ResourceList.vue b/src/shared/components/ncContextResource/ResourceList.vue
index 2738955c23..cbedaa9500 100644
--- a/src/shared/components/ncContextResource/ResourceList.vue
+++ b/src/shared/components/ncContextResource/ResourceList.vue
@@ -5,10 +5,16 @@
 <template>
 	<div>
 		<div v-if="loading" class="icon-loading" />
-		<ul v-if="getResources && getResources.length > 0" class="resource-list">
-			<div v-for="resource in getResources" :key="resource.key" class="row">
+		<ul v-if="mutableResources && mutableResources.length > 0" class="resource-list">
+			<li v-for="(resource, index) in mutableResources" :key="resource.key" class="row" draggable="true"
+				@dragstart="dragStart(index)" @dragover.prevent="dragOver(index)" @dragend="dragEnd(index)">
 				<div class="fix-col-2">
-					<div style="display:flex; align-items: center; padding: 10px;">
+					<div style="display:flex; align-items: center; width: 100%;">
+						<NcButton :aria-label="t('tables', 'Move')" type="tertiary-no-background" class="move-button">
+							<template #icon>
+								<DragHorizontalVariant :size="20" />
+							</template>
+						</NcButton>
 						{{ resource.emoji }} &nbsp; {{ resource.title }}
 					</div>
 				</div>
@@ -17,7 +23,7 @@
 						{{ t('tables', 'Delete') }}
 					</NcActionButton>
 				</div>
-			</div>
+			</li>
 		</ul>
 		<div v-else>
 			{{ t('tables', 'No selected resources') }}
@@ -26,11 +32,14 @@
 </template>
 
 <script>
-import { NcActionButton } from '@nextcloud/vue'
+import { NcActionButton, NcButton } from '@nextcloud/vue'
+import DragHorizontalVariant from 'vue-material-design-icons/DragHorizontalVariant.vue'
 
 export default {
 	components: {
 		NcActionButton,
+		NcButton,
+		DragHorizontalVariant,
 	},
 
 	props: {
@@ -43,21 +52,19 @@ export default {
 	data() {
 		return {
 			loading: false,
+			mutableResources: [],
+			draggedItem: null,
+			startDragIndex: null,
 		}
 	},
 
-	computed: {
-		sortedResources() {
-			return [...this.tableResources, ...this.viewResources].slice()
-		},
-		getResources() {
-			return [...this.viewResources, ...this.tableResources]
-		},
-		viewResources() {
-			return this.resources.filter(resource => resource.nodeType === 1)
-		},
-		tableResources() {
-			return this.resources.filter(resource => resource.nodeType === 0)
+	watch: {
+		resources: {
+			handler(newResources) {
+				this.mutableResources = [...newResources]
+			},
+			deep: true,
+			immediate: true,
 		},
 	},
 
@@ -65,6 +72,31 @@ export default {
 		actionDelete(resource) {
 			this.$emit('remove', resource)
 		},
+		dragStart(index) {
+			this.draggedItem = this.mutableResources[index]
+			this.startDragIndex = index
+		},
+		dragOver(index) {
+			if (this.draggedItem === null) return
+			const draggedIndex = this.mutableResources.indexOf(this.draggedItem)
+			if (index !== draggedIndex) {
+				this.mutableResources.splice(draggedIndex, 1)
+				this.mutableResources.splice(index, 0, this.draggedItem)
+				this.$emit('update:resources', this.mutableResources)
+			}
+		},
+		dragEnd(goalIndex) {
+			if (this.draggedItem === null) return
+			const goal = goalIndex !== undefined ? goalIndex : this.mutableResources.indexOf(this.draggedItem)
+			if (this.startDragIndex === goal) {
+				this.draggedItem = null
+				this.startDragIndex = null
+				return
+			}
+			this.draggedItem = null
+			this.startDragIndex = null
+			this.$emit('update:resources', this.mutableResources)
+		},
 	},
 }
 </script>
@@ -79,4 +111,9 @@ export default {
 .resource-label {
 	font-style: italic;
 }
+
+.move-button {
+	cursor: move !important;
+	padding-right: 10px;
+}
 </style>