diff --git a/apps/client/src/services/branches.ts b/apps/client/src/services/branches.ts
index b1231e598..0613ea4ea 100644
--- a/apps/client/src/services/branches.ts
+++ b/apps/client/src/services/branches.ts
@@ -176,11 +176,6 @@ async function moveNodeUpInHierarchy(node: Fancytree.FancytreeNode) {
         toastService.showError(resp.message);
         return;
     }
-
-    if (!hoistedNoteService.isTopLevelNode(node) && node.getParent().getChildren().length <= 1) {
-        node.getParent().folder = false;
-        node.getParent().renderTitle();
-    }
 }
 
 function filterSearchBranches(branchIds: string[]) {
diff --git a/apps/client/src/widgets/note_tree.ts b/apps/client/src/widgets/note_tree.ts
index 1fd373559..49eb4dcac 100644
--- a/apps/client/src/widgets/note_tree.ts
+++ b/apps/client/src/widgets/note_tree.ts
@@ -1606,7 +1606,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
         return !parentNote?.hasLabel("sorted");
     }
 
-    moveNoteUpCommand({ node }: CommandListenerData<"moveNoteUp">) {
+    async moveNoteUpCommand({ node }: CommandListenerData<"moveNoteUp">) {
         if (!node || !this.canBeMovedUpOrDown(node)) {
             return;
         }
@@ -1614,11 +1614,12 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
         const beforeNode = node.getPrevSibling();
 
         if (beforeNode !== null) {
-            branchService.moveBeforeBranch([node.data.branchId], beforeNode.data.branchId);
+            await branchService.moveBeforeBranch([node.data.branchId], beforeNode.data.branchId);
+            node.makeVisible({ scrollIntoView: true });
         }
     }
 
-    moveNoteDownCommand({ node }: CommandListenerData<"moveNoteDown">) {
+    async moveNoteDownCommand({ node }: CommandListenerData<"moveNoteDown">) {
         if (!this.canBeMovedUpOrDown(node)) {
             return;
         }
@@ -1626,7 +1627,8 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
         const afterNode = node.getNextSibling();
 
         if (afterNode !== null) {
-            branchService.moveAfterBranch([node.data.branchId], afterNode.data.branchId);
+            await branchService.moveAfterBranch([node.data.branchId], afterNode.data.branchId);
+            node.makeVisible({ scrollIntoView: true });
         }
     }