From c1baaac86f18879dc7ba7e80805f0e477697cd62 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Fri, 17 Jan 2025 11:58:20 +0100
Subject: [PATCH] Fix #3136

---
 src/webserver/SessionActions.jl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/webserver/SessionActions.jl b/src/webserver/SessionActions.jl
index 0135c9dbc..52733f50e 100644
--- a/src/webserver/SessionActions.jl
+++ b/src/webserver/SessionActions.jl
@@ -258,7 +258,9 @@ function move(session::ServerSession, notebook::Notebook, newpath::String)
     else
         move_notebook!(notebook, newpath; disable_writing_notebook_files=session.options.server.disable_writing_notebook_files)
         putplutoupdates!(session, clientupdate_notebook_list(session.notebooks))
-        WorkspaceManager.cd_workspace((session, notebook), newpath)
+        let workspace = WorkspaceManager.get_workspace((session, notebook); allow_creation=false)
+            isnothing(workspace) || WorkspaceManager.cd_workspace(workspace, newpath)
+        end
     end 
 end