diff --git a/modules/emacs.el b/modules/emacs.el
index 4404e2b..fc83811 100644
--- a/modules/emacs.el
+++ b/modules/emacs.el
@@ -443,8 +443,6 @@
 
   (use-package eyebrowse
     :after perspective
-    :init
-    (setq eyebrowse-keymap-prefix (kbd "C-x C-x"))
     :config
     (require 'eyepersp)
     (setq eyebrowse-default-workspace-slot 0)
diff --git a/modules/modeline.el b/modules/modeline.el
index b44007d..235d139 100644
--- a/modules/modeline.el
+++ b/modules/modeline.el
@@ -75,13 +75,18 @@
     (defun emodule/modeline-eyebrowse ()
       "Return the currently active eyebrowse workspace."
       (if (bound-and-true-p eyebrowse-mode)
-          (let* ((num (eyebrowse--get 'current-slot))
-                 (tag (when num
-                        (nth 2 (assoc num (eyebrowse--get 'window-configs)))))
-                 (str (if (and tag (< 0 (length tag)))
-                          tag
-                        (when num (int-to-string num)))))
-             (propertize str 'face 'eyebrowse-mode-line-active))
+          (let* ((cur (eyebrowse--get 'current-slot))
+                 (all (mapcar 'car (eyebrowse--get 'window-configs)))
+                 strs)
+            (setq strs
+                  (mapcar (lambda (el)
+                            (if (= cur el)
+                                (propertize (int-to-string el)
+                                            'face
+                                            'eyebrowse-mode-line-active)
+                              (int-to-string el)))
+                          all))
+            (apply 'concat strs))
         ""))
 
     (doom-modeline-def-segment emodule/modeline-eyebrowse-segment