 ;;;###autoload
 (defun doom/workgroup-display (&optional suppress-update return-p message)
   (interactive)
-  (when (wg-current-session t)
+  (awhen (wg-current-session t)
     (unless (eq suppress-update t)
       (doom/workgroup-update-names (if (wg-workgroup-p suppress-update) suppress-update)))
     (let ((output (wg-display-internal

                        workgroup
                        (format " %s %s " (doom--num-to-unicode (1+ index)) (wg-workgroup-name workgroup))
                        'wg-current-workgroup-p)))
                   (wg-workgroup-list))))
      (if return-p
          output
        (message "%s%s" output (or message ""))))))

  "Create a new workgroup. If BANG, overwrite any workgroup named NAME."
  (interactive "<!><a>")
  (unless name
    (setq name (format "#%s" (1+ (length (wg-session-workgroup-list (wg-current-session t)))))))
  (let ((new-wg (wg-get-workgroup name t)))
    (when (and new-wg bang)
      (wg-delete-workgroup new-wg)
