diff --git a/modules/app/irc/autoload/irc.el b/modules/app/irc/autoload/irc.el
index 7f619ec57..cf465bffc 100644
--- a/modules/app/irc/autoload/irc.el
+++ b/modules/app/irc/autoload/irc.el
@@ -101,7 +101,7 @@ argument) is non-nil only show channels in current server."
 
 ;;;###autoload
 (defun +irc--add-circe-buffer-to-workspace-h ()
-  (when (and (bound-and-true-p persp-mode)
+  (when (and (modulep! :ui workspaces)
              (+workspaces-exists-p +irc--workspace-name))
     (let ((buf (current-buffer)))
       ;; Add a new circe buffer to irc workspace when we're in another workspace
diff --git a/modules/completion/vertico/config.el b/modules/completion/vertico/config.el
index 18a1214b4..492ab0326 100644
--- a/modules/completion/vertico/config.el
+++ b/modules/completion/vertico/config.el
@@ -332,7 +332,7 @@ orderless."
             '(doom/find-file-in-private-config . file)
             '(doom/describe-active-minor-mode . minor-mode)
             '(flycheck-error-list-set-filter . builtin)
-            '(persp-switch-to-buffer . buffer)
+            '(tabspaces-switch-to-buffer . buffer)
             '(projectile-find-file . project-file)
             '(projectile-recentf . project-file)
             '(projectile-switch-to-buffer . buffer)
diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el
index 68612e05b..390afe5d5 100644
--- a/modules/config/default/+emacs-bindings.el
+++ b/modules/config/default/+emacs-bindings.el
@@ -5,7 +5,6 @@
       doom-localleader-alt-key "C-c l")
 
 ;; persp-mode and projectile in different prefixes
-(setq! persp-keymap-prefix (kbd "C-c w"))
 (after! projectile
   (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map))
 
diff --git a/modules/ui/popup/+hacks.el b/modules/ui/popup/+hacks.el
index 05dd44983..d9e23a9f9 100644
--- a/modules/ui/popup/+hacks.el
+++ b/modules/ui/popup/+hacks.el
@@ -295,15 +295,6 @@ Ugh, such an ugly hack."
     (apply fn args)))
 
 
-;;;###package persp-mode
-(defadvice! +popup--persp-mode-restore-popups-a (&rest _)
-  "Restore popup windows when loading a perspective from file."
-  :after #'persp-load-state-from-file
-  (dolist (window (window-list))
-    (when (+popup-parameter 'popup window)
-      (+popup--init window nil))))
-
-
 (after! pdf-tools
   (setq tablist-context-window-display-action
         '((+popup-display-buffer-stacked-side-window-fn)
diff --git a/modules/ui/popup/README.org b/modules/ui/popup/README.org
index dd810e1f0..187229a4f 100644
--- a/modules/ui/popup/README.org
+++ b/modules/ui/popup/README.org
@@ -35,8 +35,6 @@ clean up after itself and kill off buffers I mark as transient.
   before entering the popup, rather than in a new window.
 - [[doom-package:wgrep]] buffers are advised to close themselves when aborting or committing
   changes.
-- [[doom-package:persp-mode]] is advised to restore popup windows when loading a session from
-  file.
 - Interactive calls to ~windmove-*~ commands (used by ~evil-window-*~ commands)
   will ignore the ~no-other-window~ window parameter, allowing you to switch to
   popup windows as if they're ordinary windows.