diff --git a/modules/completion/helm/autoload/helm.el b/modules/completion/helm/autoload/helm.el
index 655e635f3..7d0e31e85 100644
--- a/modules/completion/helm/autoload/helm.el
+++ b/modules/completion/helm/autoload/helm.el
@@ -19,11 +19,24 @@
      #'helm-projectile-find-file)))
 
 ;;;###autoload
-(defun +helm/persp-buffer-list ()
-  "A version of `helm-buffers-list', but with its buffer list restricted to the
+(defun +helm/workspace-buffer-list ()
+  "A version of `helm-buffers-list' with its buffer list restricted to the
 current workspace."
   (interactive)
-  (with-persp-buffer-list nil (helm-buffers-list)))
+  (unless (featurep! :feature workspaces)
+    (user-error "This command requires the :feature workspaces module"))
+  (with-no-warnings
+    (with-persp-buffer-list nil (helm-buffers-list))))
+
+;;;###autoload
+(defun +helm/workspace-mini ()
+  "A version of `helm-mini' with its buffer list restricted to the current
+workspace."
+  (interactive)
+  (unless (featurep! :feature workspaces)
+    (user-error "This command requires the :feature workspaces module"))
+  (with-no-warnings
+    (with-persp-buffer-list nil (helm-mini))))
 
 
 ;;
diff --git a/modules/completion/helm/config.el b/modules/completion/helm/config.el
index 02159e05f..5ad874feb 100644
--- a/modules/completion/helm/config.el
+++ b/modules/completion/helm/config.el
@@ -49,7 +49,7 @@ be negative.")
     [remap imenu-anywhere]            #'helm-imenu-anywhere
     [remap imenu]                     #'helm-semantic-or-imenu
     [remap noop-show-kill-ring]       #'helm-show-kill-ring
-    [remap persp-switch-to-buffer]    #'+helm/persp-buffer-list
+    [remap persp-switch-to-buffer]    #'+helm/workspace-mini
     [remap switch-to-buffer]          #'helm-buffers-list
     [remap projectile-find-file]      #'+helm/projectile-find-file
     [remap projectile-recentf]        #'helm-projectile-recentf