diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el
index 5078b975c..987228eeb 100644
--- a/modules/completion/ivy/autoload/ivy.el
+++ b/modules/completion/ivy/autoload/ivy.el
@@ -6,7 +6,7 @@
       (setq buffer (get-buffer buffer)))
     (+workspace-contains-buffer-p buffer)))
 
-(defun +ivy--is-workspace-or-other-buffer-p (buffer)
+(defun +ivy--is-workspace-other-buffer-p (buffer)
   (let ((buffer (car buffer)))
     (when (stringp buffer)
       (setq buffer (get-buffer buffer)))
@@ -34,32 +34,71 @@ temporary/special buffers in `font-lock-comment-face'."
 ;;
 ;; Library
 
+(defun +ivy--switch-buffer-preview ()
+  (if (get-buffer (ivy-state-current ivy-last))
+      (ivy-call)
+    (with-ivy-window
+      (switch-to-buffer (ivy-state-buffer ivy-last)))))
+
+(defun +ivy--switch-buffer (workspace other)
+  (let ((current (not other))
+        prompt action filter update unwind)
+    (cond ((and workspace current)
+           (setq prompt "Switch to workspace buffer: "
+                 action #'ivy--switch-buffer-action
+                 filter #'+ivy--is-workspace-other-buffer-p))
+          (workspace
+           (setq prompt "Switch to workspace buffer in other window: "
+                 action #'ivy--switch-buffer-other-window-action
+                 filter #'+ivy--is-workspace-buffer-p))
+          (current
+           (setq prompt "Switch to buffer: "
+                 action #'ivy--switch-buffer-action))
+          (t
+           (setq prompt "Switch to buffer in other window: "
+                 action #'ivy--switch-buffer-other-window-action)))
+    (when +ivy-buffer-preview
+      (cond ((not (and ivy-use-virtual-buffers
+                       (eq +ivy-buffer-preview 'everything)))
+             (setq update #'+ivy--switch-buffer-preview))
+            (t
+             (setq update #'counsel--switch-buffer-update-fn
+                   unwind #'counsel--switch-buffer-unwind))))
+    (ivy-read prompt 'internal-complete-buffer
+              :action action
+              :predicate filter
+              :update-fn update
+              :unwind unwind
+              :preselect (buffer-name (other-buffer (current-buffer)))
+              :matcher #'ivy--switch-buffer-matcher
+              :keymap ivy-switch-buffer-map
+              :caller #'+ivy--switch-buffer)))
+
 ;;;###autoload
 (defun +ivy/switch-workspace-buffer (&optional arg)
   "Switch to another buffer within the current workspace.
 
 If ARG (universal argument), open selection in other-window."
   (interactive "P")
-  (ivy-read (if arg
-                "Switch to workspace buffer in other window: "
-              "Switch to workspace buffer: ")
-            'internal-complete-buffer
-            :predicate (if arg
-                           #'+ivy--is-workspace-buffer-p
-                         #'+ivy--is-workspace-or-other-buffer-p)
-            :action (if arg
-                        #'ivy--switch-buffer-other-window-action
-                      #'ivy--switch-buffer-action)
-            :preselect (buffer-name (other-buffer (current-buffer)))
-            :matcher #'ivy--switch-buffer-matcher
-            :keymap ivy-switch-buffer-map
-            :caller #'+ivy/switch-workspace-buffer))
+  (+ivy--switch-buffer t arg))
 
 ;;;###autoload
 (defun +ivy/switch-workspace-buffer-other-window ()
-  "Switch the other window to a buffer within the current workspace."
+  "Switch another window to a buffer within the current workspace."
   (interactive)
-  (+ivy/switch-workspace-buffer t))
+  (+ivy--switch-buffer t t))
+
+;;;###autoload
+(defun +ivy/switch-buffer ()
+  "Switch to another buffer."
+  (interactive)
+  (+ivy--switch-buffer nil nil))
+
+;;;###autoload
+(defun +ivy/switch-buffer-other-window ()
+  "Switch to another buffer in another window."
+  (interactive)
+  (+ivy--switch-buffer nil t))
 
 (defun +ivy--tasks-candidates (tasks)
   "Generate a list of task tags (specified by `+ivy-task-tags') for
diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el
index bc1232bf8..a1ca0ff75 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -3,6 +3,13 @@
 (defvar +ivy-buffer-icons nil
   "If non-nil, show buffer mode icons in `ivy-switch-buffer' and the like.")
 
+(defvar +ivy-buffer-preview nil
+  "If non-nil, preview buffers while switching, à la `counsel-switch-buffer'.
+
+When nil, don't preview anything.
+When non-nil, preview non-virtual buffers.
+When 'everything, also preview virtual buffers")
+
 (defvar +ivy-task-tags
   '(("TODO"  . warning)
     ("FIXME" . error))
@@ -58,9 +65,11 @@ immediately runs it on the current candidate (ending the ivy session)."
   (after! yasnippet
     (add-to-list 'yas-prompt-functions #'+ivy-yas-prompt nil #'eq))
 
-  (map! [remap switch-to-buffer]       #'ivy-switch-buffer
-        [remap persp-switch-to-buffer] #'+ivy/switch-workspace-buffer
-        [remap imenu-anywhere]         #'ivy-imenu-anywhere)
+  (map! :map ivy-mode-map
+        [remap switch-to-buffer]              #'+ivy/switch-buffer
+        [remap switch-to-buffer-other-window] #'+ivy/switch-buffer-other-window
+        [remap persp-switch-to-buffer]        #'+ivy/switch-workspace-buffer
+        [remap imenu-anywhere]                #'ivy-imenu-anywhere)
 
   (ivy-mode +1)
 
@@ -76,9 +85,7 @@ immediately runs it on the current candidate (ending the ivy session)."
   :hook (ivy-mode . ivy-rich-mode)
   :config
   ;; Show more buffer information in other switch-buffer commands too
-  (dolist (cmd '(ivy-switch-buffer-other-window
-                 +ivy/switch-workspace-buffer
-                 +ivy/switch-workspace-buffer-other-window
+  (dolist (cmd '(+ivy--switch-buffer
                  counsel-projectile-switch-to-buffer))
     (ivy-set-display-transformer cmd 'ivy-rich--ivy-switch-buffer-transformer))
   ;; Use `+ivy-rich-buffer-name' to display buffer names