diff --git a/forge-pkg.el b/forge-pkg.el
index 404f61a6..3f779c87 100644
--- a/forge-pkg.el
+++ b/forge-pkg.el
@@ -7,7 +7,7 @@
     (emacsql        "20240124")
     (ghub           "20240507")
     (let-alist      "1.0.6")
-    (magit          "20240428")
+    (magit          "20240701")
     (markdown-mode  "2.6")
     (seq            "2.24")
     (transient      "20240421")
diff --git a/lisp/forge-topic.el b/lisp/forge-topic.el
index 41d9cdd8..6af02cf2 100644
--- a/lisp/forge-topic.el
+++ b/lisp/forge-topic.el
@@ -1031,9 +1031,8 @@ This mode itself is never used directly."
          (magit-generate-buffer-name-function (lambda (_mode _value) name)))
     (magit-setup-buffer-internal
      (if (forge-issue-p topic) #'forge-issue-mode #'forge-pullreq-mode)
-     t `((forge-buffer-topic ,topic)
-         (default-directory ,(or (forge-get-worktree repo) "/")))
-     name)
+     t `((forge-buffer-topic ,topic))
+     name (or (forge-get-worktree repo) "/"))
     (forge-topic-mark-read topic)))
 
 (defun forge-topic-refresh-buffer ()
diff --git a/lisp/forge-topics.el b/lisp/forge-topics.el
index ee17a480..f9ae463a 100644
--- a/lisp/forge-topics.el
+++ b/lisp/forge-topics.el
@@ -135,10 +135,10 @@ Must be set before `forge-topics' is loaded.")
     (unless (or repo global)
       (error "Cannot determine repository"))
     (magit-setup-buffer-internal #'forge-topics-mode nil
-                                 `((default-directory           ,dir)
-                                   (forge--buffer-topics-spec   ,spec)
+                                 `((forge--buffer-topics-spec   ,spec)
                                    (forge-buffer-unassociated-p ,global))
-                                 (get-buffer-create buf))))
+                                 (get-buffer-create buf)
+                                 dir)))
 
 (defun forge-topics-refresh-buffer ()
   (magit-set-header-line-format (forge-topics-buffer-desc))