From d600e3c35350f29e04025b9b79246873fe660f2f Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj@vdbonline.com>
Date: Tue, 20 Jan 2026 21:30:47 +0100
Subject: [PATCH 1/2] refactor: keep tab ordering stable when moving tabs
 between splits

---
 src/tui/status/tabs.zig | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/tui/status/tabs.zig b/src/tui/status/tabs.zig
index 7f1566e..6c379cc 100644
--- a/src/tui/status/tabs.zig
+++ b/src/tui/status/tabs.zig
@@ -491,13 +491,19 @@ pub const TabBar = struct {
         const buffer = buffer_manager.buffer_from_ref(src_tab.buffer_ref);
         const active = if (buffer) |buf| if (mv.get_editor_for_buffer(buf)) |_| true else false else false;
 
-        tabs.insert(self.allocator, dst_idx, src_tab) catch @panic("OOM move_tab_to");
-
-        if (new_view != old_view) if (buffer) |buf| {
-            buf.set_last_view(new_view);
-            if (mv.get_editor_for_buffer(buf)) |editor|
-                editor.close_editor() catch {};
-        };
+        if (new_view == old_view) {
+            tabs.insert(self.allocator, dst_idx, src_tab) catch @panic("OOM move_tab_to");
+        } else {
+            if (new_view orelse 0 < old_view orelse 0)
+                tabs.append(self.allocator, src_tab) catch @panic("OOM move_tab_to")
+            else
+                tabs.insert(self.allocator, 0, src_tab) catch @panic("OOM move_tab_to");
+            if (buffer) |buf| {
+                buf.set_last_view(new_view);
+                if (mv.get_editor_for_buffer(buf)) |editor|
+                    editor.close_editor() catch {};
+            }
+        }
 
         const drag_source, _ = tui.get_drag_source();
         self.update_tab_widgets(drag_source) catch {};

From 6c478a97a0b598381da7e83cbff200912ff6824e Mon Sep 17 00:00:00 2001
From: CJ van den Berg <cj@vdbonline.com>
Date: Tue, 20 Jan 2026 21:52:58 +0100
Subject: [PATCH 2/2] fix: close the correct view when last tab in view is
 closed

---
 src/tui/mainview.zig | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/tui/mainview.zig b/src/tui/mainview.zig
index 75c7519..8653648 100644
--- a/src/tui/mainview.zig
+++ b/src/tui/mainview.zig
@@ -966,6 +966,23 @@ const cmds = struct {
     }
     pub const close_split_meta: Meta = .{ .description = "Close split view" };
 
+    pub fn close_view(self: *Self, ctx: Ctx) Result {
+        var view: usize = undefined;
+        if (!try ctx.args.match(.{tp.extract(&view)})) return error.InvalidCloseViewArgument;
+
+        if (view >= self.views.widgets.items.len) return;
+        self.remove_view(view) catch return;
+
+        const buffers = self.buffer_manager.list_unordered(self.allocator) catch @panic("OOM close_view");
+        defer self.allocator.free(buffers);
+        for (buffers) |buffer| if (buffer.get_last_view()) |buffer_view|
+            if (buffer_view >= view)
+                buffer.set_last_view(buffer_view - 1);
+
+        _ = self.widgets_widget.msg(.{"splits_updated"}) catch {};
+    }
+    pub const close_view_meta: Meta = .{ .arguments = &.{.integer} };
+
     pub fn close_splits(self: *Self, _: Ctx) Result {
         while (self.views.widgets.items.len > 1)
             try self.remove_view(1);
@@ -1524,11 +1541,8 @@ pub fn handle_editor_event(self: *Self, editor: *ed.Editor, m: tp.message) tp.re
                 self.show_file_async(file_path)
             else if (self.views.widgets.items.len == 1)
                 self.show_home_async()
-            else {
-                tp.self_pid().send(.{ "cmd", "close_split", .{} }) catch return;
-                if (self.get_next_mru_buffer(.non_hidden)) |file_path|
-                    self.show_file_async(file_path);
-            }
+            else
+                tp.self_pid().send(.{ "cmd", "close_view", .{view} }) catch return;
         } else self.show_home_async();
         return;
     }