diff --git a/files/templates/header.html b/files/templates/header.html
index e3e11281a2..2b165f7aa8 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -30,7 +30,7 @@
 			<a class="mobile-nav-icon d-md-none" href="/admin"><i class="fas fa-crown align-middle text-gray-500 black"></i></a>
 			{% endif %}
 			{% if v %}
-			<a class="mobile-nav-icon d-md-none" href="/submit"><i class="fas fa-feather-alt align-middle text-gray-500 black"></i></a>
+			<a class="mobile-nav-icon d-md-none" href="/submit{% if hole %}/{{hole}}{% endif %}"><i class="fas fa-feather-alt align-middle text-gray-500 black"></i></a>
 			{% else %}
 			<a class="mobile-nav-icon d-md-none" href="/login"><i class="fas fa-feather-alt align-middle text-gray-500 black"></i></a>
 			{% endif %}
@@ -72,7 +72,7 @@
 				{% endif %}
 
 				<li class="nav-item d-flex align-items-center justify-content-center text-center mx-1">
-					<a class="nav-link" href="/submit" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Create post"><i class="fas fa-feather-alt"></i></a>
+					<a class="nav-link" href="/submit{% if hole %}/{{hole}}{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Create post"><i class="fas fa-feather-alt"></i></a>
 				</li>
 
 				<li class="nav-item d-flex align-items-center justify-content-center text-center mx-1">
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 3c83286180..97c30a2655 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -550,7 +550,7 @@
 			</span>
 			<h2 class="h5">You haven't {% if "saved" in request.full_path %}saved{% else %}made{% endif %} a post yet</h2>
 			<p class="text-muted mb-md-5">Your {% if "saved" in request.full_path %}saved posts{% else %}posting history{% endif %} will show here.</p>
-			{% if "saved" not in request.full_path %}<a href="/submit" class="btn btn-primary">Create a post</a>{% endif %}
+			{% if "saved" not in request.full_path %}<a href="/submit{% if hole %}/{{hole}}{% endif %}" class="btn btn-primary">Create a post</a>{% endif %}
 		</div>			
 	</div>	
 </div>