diff --git a/src/components/views/Board.jsx b/src/components/views/Board.jsx
index e685109d..4fb4ca5b 100644
--- a/src/components/views/Board.jsx
+++ b/src/components/views/Board.jsx
@@ -377,12 +377,12 @@ const Board = () => {
         <PostFormLink id="post-form-link" showPostFormLink={showPostFormLink} selectedStyle={selectedStyle} >
           <div id="post-form-link-desktop">
               [
-                <a href={() => {}} onClick={useClickForm()} onMouseOver={(event) => event.target.style.cursor='pointer'}>Start a New Thread</a>
+                <Link to={`/p/${subplebbitAddress}/post`} onClick={useClickForm()} onMouseOver={(event) => event.target.style.cursor='pointer'}>Start a New Thread</Link>
               ]
             </div>
             <div id="post-form-link-mobile">
               <span className="btn-wrap">
-                <a href={() => {}} onClick={useClickForm()} onMouseOver={(event) => event.target.style.cursor='pointer'}>Start a New Thread</a>
+                <Link to={`/p/${subplebbitAddress}/post`} onClick={useClickForm()} onMouseOver={(event) => event.target.style.cursor='pointer'}>Start a New Thread</Link>
               </span>
             </div>
           </PostFormLink>
diff --git a/src/components/views/Catalog.jsx b/src/components/views/Catalog.jsx
index 166e4837..7e295462 100644
--- a/src/components/views/Catalog.jsx
+++ b/src/components/views/Catalog.jsx
@@ -292,12 +292,12 @@ const Catalog = () => {
           <PostFormLink id="post-form-link" showPostFormLink={showPostFormLink} selectedStyle={selectedStyle} >
             <div id="post-form-link-desktop">
               [
-                <a href={() => {}} onClick={useClickForm()} onMouseOver={(event) => event.target.style.cursor='pointer'}>Start a New Thread</a>
+                <Link to={`/p/${subplebbitAddress}/catalog/post`} onClick={useClickForm()} onMouseOver={(event) => event.target.style.cursor='pointer'}>Start a New Thread</Link>
               ]
             </div>
             <div id="post-form-link-mobile">
               <span className="btn-wrap">
-                <a href={() => {}} onClick={useClickForm()} onMouseOver={(event) => event.target.style.cursor='pointer'}>Start a New Thread</a>
+                <Link to={`/p/${subplebbitAddress}/catalog/post`} onClick={useClickForm()} onMouseOver={(event) => event.target.style.cursor='pointer'}>Start a New Thread</Link>
               </span>
             </div>
           </PostFormLink>
diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx
index a697894a..16068b2a 100644
--- a/src/components/views/Thread.jsx
+++ b/src/components/views/Thread.jsx
@@ -349,12 +349,12 @@ const Thread = () => {
             </div>
             <div id="post-form-link-desktop">
               [
-                <a href={()=> {}} onClick={() => {handleClickForm(); setSelectedShortCid(comment.shortCid)}} onMouseOver={(event) => event.target.style.cursor='pointer'}>Post a Reply</a>
+                <Link to={`/p/${subplebbitAddress}/c/${selectedThread}/post`} onClick={() => {handleClickForm(); setSelectedShortCid(comment.shortCid)}} onMouseOver={(event) => event.target.style.cursor='pointer'}>Post a Reply</Link>
               ]
             </div>
             <div id="post-form-link-mobile">
               <span className="btn-wrap">
-                <a href={()=> {}} onClick={() => {handleClickForm(); setSelectedShortCid(comment.shortCid)}} onMouseOver={(event) => event.target.style.cursor='pointer'}>Post a Reply</a>
+                <Link to={`/p/${subplebbitAddress}/c/${selectedThread}/post`} onClick={() => {handleClickForm(); setSelectedShortCid(comment.shortCid)}} onMouseOver={(event) => event.target.style.cursor='pointer'}>Post a Reply</Link>
               </span>
             </div>
           </ReplyFormLink>
diff --git a/src/hooks/useClickForm.js b/src/hooks/useClickForm.js
index 94ce2048..3eec12b7 100644
--- a/src/hooks/useClickForm.js
+++ b/src/hooks/useClickForm.js
@@ -1,27 +1,11 @@
-import { useNavigate, useLocation } from "react-router-dom";
 import useGeneralStore from "./stores/useGeneralStore";
 
 const useClickForm = () => {
-  const navigate = useNavigate();
-  const location = useLocation();
   const { setShowPostForm, setShowPostFormLink } = useGeneralStore.getState();
 
   const handleClickForm = () => {
     setShowPostForm(true);
     setShowPostFormLink(false);
-    const pathComponents = location.pathname.split("/");
-    const subplebbitAddress = pathComponents[2];
-    const threadCid = pathComponents[4];
-
-    if (pathComponents[1] === "p") {
-      if (pathComponents[3] === "c") {
-        navigate(`/p/${subplebbitAddress}/c/${threadCid}/post`);
-      } else if (pathComponents[3] === "catalog") {
-        navigate(`/p/${subplebbitAddress}/catalog/post`);
-      } else {
-        navigate(`/p/${subplebbitAddress}/post`);
-      }
-    }
   };
 
   return handleClickForm;