diff --git a/src/lib/decorate-text.jsx b/src/lib/decorate-text.jsx
index 78ebec51f..f2df260a2 100644
--- a/src/lib/decorate-text.jsx
+++ b/src/lib/decorate-text.jsx
@@ -30,16 +30,6 @@ module.exports = (text, opts) => {
         ));
     }
 
-    // Match hashtags
-    if (opts.hashtags) {
-        replacedText = reactStringReplace(replacedText, /#([\w-]+)/g, (match, i) => (
-            <a
-                href={`/search/projects?q=${match}`}
-                key={match + i}
-            >#{match}</a>
-        ));
-    }
-
     // Match scratch links
     /*
         Ported from the python...
@@ -71,5 +61,15 @@ module.exports = (text, opts) => {
         ));
     }
 
+    // Match hashtags
+    if (opts.hashtags) {
+        replacedText = reactStringReplace(replacedText, /#([\w-]+)/g, (match, i) => (
+            <a
+                href={`/search/projects?q=${match}`}
+                key={match + i}
+            >#{match}</a>
+        ));
+    }
+
     return replacedText;
 };
diff --git a/src/views/preview/presentation.jsx b/src/views/preview/presentation.jsx
index 529b1f46b..bad39785a 100644
--- a/src/views/preview/presentation.jsx
+++ b/src/views/preview/presentation.jsx
@@ -431,7 +431,7 @@ const PreviewPresentation = ({
                                                 {decorateText(projectInfo.instructions, {
                                                     usernames: true,
                                                     hashtags: true,
-                                                    scratchLinks: false
+                                                    scratchLinks: true
                                                 })}
                                             </div>
                                         }
@@ -482,7 +482,7 @@ const PreviewPresentation = ({
                                                 {decorateText(projectInfo.description, {
                                                     usernames: true,
                                                     hashtags: true,
-                                                    scratchLinks: false
+                                                    scratchLinks: true
                                                 })}
                                             </div>
                                         }