diff --git a/files/routes/posts.py b/files/routes/posts.py
index c48ab801e..76274d371 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -61,10 +61,7 @@ def publish(pid, v):
 
 	execute_snappy(p, v)
 
-	if is_site_url(request.referrer):
-		return redirect(request.referrer)
-
-	return redirect(p.permalink)
+	return {"message": "Post has been published successfully!"}
 
 @app.get("/submit")
 @app.get("/h/<sub>/submit")
diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html
index ff29fd89f..621666ea5 100644
--- a/files/templates/post_actions.html
+++ b/files/templates/post_actions.html
@@ -1,8 +1,5 @@
 {% if v and v.id==p.author_id and p.private %}
-	<form action="/publish/{{p.id}}" method="post" class="d-flex mb-0">
-		<input hidden name="formkey", value="{{v|formkey}}">
-		<button type="submit" class="list-inline-item text-small p-0 m-0 mr-3 border-0 nobackground font-weight-bold" type="submit"><i class="fas fa-globe"></i>Publish</button>
-	</form>
+	<button type="button" class="list-inline-item" data-areyousure="postToastReload(this,'/publish/{{p.id}}')" data-nonce="{{g.nonce}}" data-onclick="areyousure(this)"><i class="fas fa-flag"></i>Publish</button>
 {% endif %}
 
 
diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index 7270976e5..0e6ec6f7d 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -1,8 +1,5 @@
 {% if v and v.id==p.author_id and p.private %}
-	<form class="btn-block mb-0" action="/publish/{{p.id}}" method="post">
-		<input hidden name="formkey", value="{{v|formkey}}">
-		<button type="submit" class="nobackground btn btn-link btn-lg text-left text-muted" data-bs-dismiss="modal" type="submit"><i class="fas fa-globe text-center mr-2"></i>Publish</button>
-	</form>
+	<button type="button" class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-areyousure="postToastReload(this,'/publish/{{p.id}}')" data-nonce="{{g.nonce}}" data-onclick="areyousure(this)"><i data-dismiss="modal" class="far fa-flag text-center text-muted mr-2"></i>Publish</button>
 {% endif %}