diff --git a/template-parts/content-page.php b/template-parts/content-page.php
index b20eff0c2a..6eb9b461da 100644
--- a/template-parts/content-page.php
+++ b/template-parts/content-page.php
@@ -17,36 +17,32 @@
 	<?php _s_post_thumbnail(); ?>
 
 	<div class="entry-content">
-		<?php
-		the_content();
+		<?php the_content(); ?>
+	</div><!-- .entry-content -->
 
+	<footer class="entry-footer">
+		<?php
 		wp_link_pages( array(
 			'before' => '<div class="page-links">' . esc_html__( 'Pages:', '_s' ),
 			'after'  => '</div>',
 		) );
-		?>
-	</div><!-- .entry-content -->
 
-	<?php if ( get_edit_post_link() ) : ?>
-		<footer class="entry-footer">
-			<?php
-			edit_post_link(
-				sprintf(
-					wp_kses(
-						/* translators: %s: Name of current post. Only visible to screen readers */
-						__( 'Edit <span class="screen-reader-text">%s</span>', '_s' ),
-						array(
-							'span' => array(
-								'class' => array(),
-							),
-						)
-					),
-					get_the_title()
+		edit_post_link(
+			sprintf(
+				wp_kses(
+					/* translators: %s: Name of current post. Only visible to screen readers */
+					__( 'Edit <span class="screen-reader-text">%s</span>', '_s' ),
+					array(
+						'span' => array(
+							'class' => array(),
+						),
+					)
 				),
-				'<span class="edit-link">',
-				'</span>'
-			);
-			?>
-		</footer><!-- .entry-footer -->
-	<?php endif; ?>
+				get_the_title()
+			),
+			'<span class="edit-link">',
+			'</span>'
+		);
+		?>
+	</footer><!-- .entry-footer -->
 </article><!-- #post-<?php the_ID(); ?> -->
diff --git a/template-parts/content.php b/template-parts/content.php
index 0573e82e53..a433ecd927 100644
--- a/template-parts/content.php
+++ b/template-parts/content.php
@@ -45,15 +45,17 @@
 			),
 			get_the_title()
 		) );
+		?>
+	</div><!-- .entry-content -->
 
+	<footer class="entry-footer">
+		<?php
 		wp_link_pages( array(
 			'before' => '<div class="page-links">' . esc_html__( 'Pages:', '_s' ),
 			'after'  => '</div>',
 		) );
-		?>
-	</div><!-- .entry-content -->
 
-	<footer class="entry-footer">
-		<?php _s_entry_footer(); ?>
+		_s_entry_footer();
+		?>
 	</footer><!-- .entry-footer -->
 </article><!-- #post-<?php the_ID(); ?> -->