diff --git a/files/routes/comments.py b/files/routes/comments.py
index e4fcc941d..39bea7bb5 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -67,8 +67,8 @@ def pusher_thread(interests, c, username):
 @auth_desired
 def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None):
 
-	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}")
-	if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out',''))
+	if not v and not request.path.startswith('/logged_out'): return redirect(f"/logged_out{request.full_path}#context")
+	if v and request.path.startswith('/logged_out'): return redirect(request.full_path.replace('/logged_out','') + '#context')
 
 	try: cid = int(cid)
 	except: abort(404)
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 3eb8befd9..c05322320 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -1,9 +1,10 @@
 {%- from 'util/assetcache.html' import asset -%}
 {%- import 'util/helpers.html' as help -%}
 {% if not ajax %}
-	{% if comment_info and not request.full_path.endswith('#context') %}
+	{% if comment_info %}
 		<script>
-			history.pushState(null, null, '#context');
+			if (location.hash != 'context')
+				location.hash = 'context'
 		</script>
 	{% endif %}