diff --git a/core/core-ui.el b/core/core-ui.el
index e93ac251e..bd9479711 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -27,7 +27,7 @@
  show-paren-highlight-openparen t
  show-paren-when-point-inside-paren t
  split-width-threshold nil      ; favor horizontal splits
- uniquify-buffer-name-style nil
+ uniquify-buffer-name-style 'forward
  use-dialog-box nil             ; always avoid GUI
  visible-cursor nil
  x-stretch-cursor nil