diff --git a/files/templates/errors/WPD/502.html b/files/templates/errors/WPD/502.html
index 14bd48aed..0453e8d27 100644
--- a/files/templates/errors/WPD/502.html
+++ b/files/templates/errors/WPD/502.html
@@ -73,17 +73,6 @@
 							<img loading="lazy" class="ml-1" id="logo" alt="logo" src="/i/WPD/logo.webp?v=3009" width="70">
 						</a>
 					</div>
-
-					<div class="flex-grow-1 d-fl d-mob-none py-2">
-						<form class="form-inline search flex-nowrap mx-0 mx-lg-auto mb-0" action="/search/posts/" method="get">
-							<input autocomplete="off" class="form-control w-100" type="search" placeholder="Search" name="q" >
-							<span class="input-group-append">
-								<span class="input-group-text border-0 bg-transparent">
-									<i class="fa fa-search"></i>
-								</span>
-							</span>
-						</form>
-					</div>
 				</div>
 			</div>
 		</nav>
diff --git a/files/templates/errors/rDrama/502.html b/files/templates/errors/rDrama/502.html
index 63caa5c62..749f386ab 100644
--- a/files/templates/errors/rDrama/502.html
+++ b/files/templates/errors/rDrama/502.html
@@ -73,17 +73,6 @@
 							<img loading="lazy" class="ml-1" id="logo" alt="logo" src="/i/rDrama/logo.webp?v=3009" width="70">
 						</a>
 					</div>
-
-					<div class="flex-grow-1 d-fl d-mob-none py-2">
-						<form class="form-inline search flex-nowrap mx-0 mx-lg-auto mb-0" action="/search/posts/" method="get">
-							<input autocomplete="off" class="form-control w-100" type="search" placeholder="Search" name="q">
-							<span class="input-group-append">
-								<span class="input-group-text border-0 bg-transparent">
-									<i class="fa fa-search"></i>
-								</span>
-							</span>
-						</form>
-					</div>
 				</div>
 			</div>
 		</nav>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index b74a03177..34665402c 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -324,7 +324,7 @@
 	{{macros.comment_reply_box(p.fullname, 'comment-reply-' + p.fullname, subwrapper_css_classes='mb-3', enable_cancel_button=false)}}
 
 {% if comment_info %}
-	<div class="total mt-1"><a href="{{p.permalink}}">View entire discussion</a></div>
+	<div class="total mt-1"><a href="{{p.permalink}}#dropdownMenuButton">View entire discussion</a></div>
 {% endif %}
 
 {% if p.replies %}