diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el
index ba3034287..f44db782e 100644
--- a/modules/config/default/+emacs-bindings.el
+++ b/modules/config/default/+emacs-bindings.el
@@ -266,6 +266,8 @@
       ;;; <leader> t --- toggle
       (:prefix-map ("t" . "toggle")
        :desc "Big mode"                     "b" #'doom-big-font-mode
+       (:when (featurep! :ui fill-column)
+        :desc "Fill Column Indicator"       "c" #'+fill-column-enable-h)
        :desc "Flymake"                      "f" #'flymake-mode
        :desc "Frame fullscreen"             "F" #'toggle-frame-fullscreen
        :desc "Indent style"                 "I" #'doom/toggle-indent-style
diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 9a98d39b7..403851ac4 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -650,6 +650,8 @@
       ;;; <leader> t --- toggle
       (:prefix-map ("t" . "toggle")
        :desc "Big mode"                     "b" #'doom-big-font-mode
+       (:when (featurep! :ui fill-column)
+        :desc "Fill Column Indicator"       "c" #'+fill-column-enable-h)
        :desc "Flymake"                      "f" #'flymake-mode
        (:when (featurep! :checkers syntax)
         :desc "Flycheck"                   "f" #'flycheck-mode)
diff --git a/modules/ui/fill-column/autoload.el b/modules/ui/fill-column/autoload.el
index 2aede4639..cb2e595bf 100644
--- a/modules/ui/fill-column/autoload.el
+++ b/modules/ui/fill-column/autoload.el
@@ -1,9 +1,16 @@
 ;;; ui/fill-column/autoload.el -*- lexical-binding: t; -*-
 
-;; DEPRECATED Replaced by `display-fill-column-indicator-mode' in Emacs 27+
-
 ;;;###autoload (autoload 'hl-fill-column-mode "hl-fill-column" nil t)
 
+;;;###autoload
+;; Emacs 27 introduced `display-fill-column-indicator-mode' which should be
+;; used instead of `hl-fill-column-mode'
+(defun +fill-column-enable-h (&optional arg)
+  (interactive "p")
+  (if (fboundp 'display-fill-column-indicator-mode)
+      (display-fill-column-indicator-mode arg)
+    (hl-fill-column-mode arg)))
+
 ;;;###autoload
 (add-hook! '(text-mode-hook prog-mode-hook conf-mode-hook)
-           #'hl-fill-column-mode)
+           #'+fill-column-enable-h)
diff --git a/modules/ui/fill-column/packages.el b/modules/ui/fill-column/packages.el
index 83e03b79a..12420f96a 100644
--- a/modules/ui/fill-column/packages.el
+++ b/modules/ui/fill-column/packages.el
@@ -1,4 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/fill-column/packages.el
 
-(package! hl-fill-column :pin "5782a91ba0182c4e562fa0db6379ff9dd472856b")
+;; `hl-fill-column' is only used on Emacs versions before 27
+(unless (fboundp 'display-fill-column-indicator-mode)
+  (package! hl-fill-column :pin "5782a91ba0182c4e562fa0db6379ff9dd472856b"))