diff --git a/Changelog.md b/Changelog.md
index ac8b38d2a..42aa5c4a5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -35,6 +35,7 @@ We use yarn to install the frontend dependencies now, so you need to have that i
 ## Bug fixes
 * Fix multiple photos upload progress bar [#7655](https://github.com/diaspora/diaspora/pull/7655)
 * Photo-upload file picker now correctly restricts possible file types [#8205](https://github.com/diaspora/diaspora/pull/8205)
+* Make inline code inside links show the link color [#8387](https://github.com/diaspora/diaspora/pull/8387)
 
 ## Features
 * Add client-side cropping of profile image uploads [#7581](https://github.com/diaspora/diaspora/pull/7581)
diff --git a/app/assets/stylesheets/code.scss b/app/assets/stylesheets/code.scss
index aae6a603f..6b940e5f0 100644
--- a/app/assets/stylesheets/code.scss
+++ b/app/assets/stylesheets/code.scss
@@ -5,3 +5,12 @@ pre {
   white-space: pre;
   code { white-space: pre; }
 }
+
+// For inline-code inside links, let's force the color to the default link
+// color to make them be recognizable as links.
+p a {
+  code,
+  pre {
+    color: $link-color;
+  }
+}