diff --git a/src/Project.zig b/src/Project.zig
index 1a7bd8b..e9ce980 100644
--- a/src/Project.zig
+++ b/src/Project.zig
@@ -36,9 +36,13 @@ pub const LspOrClientError = (LspError || ClientError);
 const File = struct {
     path: []const u8,
     mtime: i128,
+    pos: FilePos = .{},
+    visited: bool = false,
+};
+
+pub const FilePos = struct {
     row: usize = 0,
     col: usize = 0,
-    visited: bool = false,
 };
 
 const Task = struct {
@@ -94,9 +98,9 @@ pub fn write_state_v1(self: *Self, writer: anytype) !void {
         try cbor.writeArrayHeader(writer, 4);
         try cbor.writeValue(writer, file.path);
         try cbor.writeValue(writer, file.mtime);
-        try cbor.writeValue(writer, file.row);
-        try cbor.writeValue(writer, file.col);
-        tp.trace(tp.channel.debug, .{ "write_state_v1", "file", file.path, file.mtime, file.row, file.col });
+        try cbor.writeValue(writer, file.pos.row);
+        try cbor.writeValue(writer, file.pos.col);
+        tp.trace(tp.channel.debug, .{ "write_state_v1", "file", file.path, file.mtime, file.pos.row, file.pos.col });
     }
     try cbor.writeArrayHeader(writer, self.tasks.items.len);
     tp.trace(tp.channel.debug, .{ "write_state_v1", "tasks", self.tasks.items.len });
@@ -374,7 +378,7 @@ pub fn merge_pending_files(self: *Self) OutOfMemoryError!void {
     self.files = self.pending;
     self.pending = std.ArrayList(File).init(self.allocator);
     for (existing) |*file| {
-        self.update_mru_internal(file.path, file.mtime, file.row, file.col) catch {};
+        self.update_mru_internal(file.path, file.mtime, file.pos.row, file.pos.col) catch {};
         self.allocator.free(file.path);
     }
     self.allocator.free(existing);
@@ -390,8 +394,8 @@ fn update_mru_internal(self: *Self, file_path: []const u8, mtime: i128, row: usi
         if (!std.mem.eql(u8, file.path, file_path)) continue;
         file.mtime = mtime;
         if (row != 0) {
-            file.row = row;
-            file.col = col;
+            file.pos.row = row;
+            file.pos.col = col;
             file.visited = true;
         }
         return;
@@ -400,8 +404,7 @@ fn update_mru_internal(self: *Self, file_path: []const u8, mtime: i128, row: usi
         (try self.files.addOne()).* = .{
             .path = try self.allocator.dupe(u8, file_path),
             .mtime = mtime,
-            .row = row,
-            .col = col,
+            .pos = .{ .row = row, .col = col },
             .visited = true,
         };
     } else {
@@ -415,8 +418,7 @@ fn update_mru_internal(self: *Self, file_path: []const u8, mtime: i128, row: usi
 pub fn get_mru_position(self: *Self, from: tp.pid_ref, file_path: []const u8) ClientError!void {
     for (self.files.items) |*file| {
         if (!std.mem.eql(u8, file.path, file_path)) continue;
-        if (file.row != 0)
-            from.send(.{ "cmd", "goto_line_and_column", .{ file.row + 1, file.col + 1 } }) catch return error.ClientFailed;
+        from.send(.{ file.pos.row, file.pos.col }) catch return error.ClientFailed;
         return;
     }
 }
diff --git a/src/project_manager.zig b/src/project_manager.zig
index b749397..7a7ff2b 100644
--- a/src/project_manager.zig
+++ b/src/project_manager.zig
@@ -16,6 +16,8 @@ const Self = @This();
 const module_name = @typeName(Self);
 const request_timeout = std.time.ns_per_s * 5;
 
+pub const FilePos = Project.FilePos;
+
 pub const Error = ProjectError || ProjectManagerError;
 
 pub const ProjectError = error{NoProject};
@@ -226,11 +228,16 @@ pub fn update_mru(file_path: []const u8, row: usize, col: usize, ephemeral: bool
     return send(.{ "update_mru", project, file_path, row, col });
 }
 
-pub fn get_mru_position(file_path: []const u8) (ProjectManagerError || ProjectError)!void {
+pub fn get_mru_position(allocator: std.mem.Allocator, file_path: []const u8) (ProjectManagerError || ProjectError || CallError || cbor.Error)!?Project.FilePos {
+    const frame = tracy.initZone(@src(), .{ .name = "get_mru_position" });
+    defer frame.deinit();
     const project = tp.env.get().str("project");
     if (project.len == 0)
         return error.NoProject;
-    return send(.{ "get_mru_position", project, file_path });
+    const rsp = try (try get()).pid.call(allocator, request_timeout, .{ "get_mru_position", project, file_path });
+    defer allocator.free(rsp.buf);
+    var pos: Project.FilePos = undefined;
+    return if (try cbor.match(rsp.buf, .{ tp.extract(&pos.row), tp.extract(&pos.col) })) pos else null;
 }
 
 const Process = struct {
diff --git a/src/tui/mainview.zig b/src/tui/mainview.zig
index 1bc11e9..3fd2331 100644
--- a/src/tui/mainview.zig
+++ b/src/tui/mainview.zig
@@ -359,6 +359,12 @@ const cmds = struct {
         const same_file = if (self.get_active_file_path()) |fp| std.mem.eql(u8, fp, f) else false;
         const have_editor_metadata = if (self.buffer_manager.get_buffer_for_file(f)) |_| true else false;
 
+        if (!same_file and !have_editor_metadata)
+            if (try project_manager.get_mru_position(self.allocator, f)) |pos| {
+                line = @intCast(pos.row);
+                column = @intCast(pos.col);
+            };
+
         if (!same_file) {
             if (self.get_active_editor()) |editor| {
                 editor.send_editor_jump_source() catch {};
@@ -374,9 +380,6 @@ const cmds = struct {
                 try command.executeName("scroll_view_center", .{});
             if (column) |col|
                 try command.executeName("goto_column", command.fmt(.{col}));
-        } else {
-            if (!same_file and !have_editor_metadata)
-                try project_manager.get_mru_position(f);
         }
         tui.need_render();
     }