diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+5.18.1
+Bug fixes:
+ - Reset the hyperlink state on line endings to avoid run-on hyperlinks
+
 5.18
 API changes:
  - Added support for hyperlinking attributes (thanks Getty Ritter). This
diff --git a/src/Graphics/Vty/Output/TerminfoBased.hs b/src/Graphics/Vty/Output/TerminfoBased.hs
--- a/src/Graphics/Vty/Output/TerminfoBased.hs
+++ b/src/Graphics/Vty/Output/TerminfoBased.hs
@@ -235,7 +235,9 @@
                 Nothing -> error "this terminal does not support hide cursor"
                 Just c -> writeCapExpr c []
             , writeSetAttr = terminfoWriteSetAttr dc terminfoCaps
-            , writeDefaultAttr = writeCapExpr (setDefaultAttr terminfoCaps) []
+            , writeDefaultAttr =
+                writeCapExpr (setDefaultAttr terminfoCaps) [] `mappend`
+                writeURLEscapes EndLink
             , writeRowEnd = writeCapExpr (clearEol terminfoCaps) []
             , inlineHack = return ()
             }
diff --git a/vty.cabal b/vty.cabal
--- a/vty.cabal
+++ b/vty.cabal
@@ -1,5 +1,5 @@
 name:                vty
-version:             5.18
+version:             5.18.1
 license:             BSD3
 license-file:        LICENSE
 author:              AUTHORS