diff --git a/adwaita-dark-theme.el b/adwaita-dark-theme.el
index 6d071c5..124037f 100644
--- a/adwaita-dark-theme.el
+++ b/adwaita-dark-theme.el
@@ -166,7 +166,8 @@
    `(fill-column-indicator ((,class (:foreground ,base-3))))
    `(match ((,class (:background ,base-0 :foreground ,green :weight bold))))
    `(trailing-whitespace ((,class (:background ,red))))
-   `(nobreak-space ((,class (:inherit 'default :underline nil))))
+   `(nobreak-space ((,class (:inherit 'default :underline t))))
+   `(nobreak-hyphen ((,class (:inherit 'nobreak-space))))
    `(vertical-border ((,class (:background ,bg-alt :foreground ,bg-alt))))
    `(link ((,class (:foreground ,blue :underline t :weight bold))))
    `(link-visited ((,class (:foreground ,magenta :underline t :weight bold))))