diff --git a/inc/template-tags.php b/inc/template-tags.php
index fb865c0..e9ab284 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -123,7 +123,14 @@ function _s_entry_footer() {
 		echo '</span>';
 	}
 
-	edit_post_link( esc_html__( 'Edit', '_s' ), '<span class="edit-link">', '</span>' );
+	edit_post_link(
+		sprintf(
+			esc_html_x( 'Edit %s', 'name of current post', '_s' ),
+			wp_kses( the_title( '<span class="screen-reader-text">"', '"</span>', false ), array( 'span' => array( 'class' => array() ) ) )
+		),
+		'<span class="edit-link">',
+		'</span>'
+	);
 }
 endif;
 
diff --git a/template-parts/content-page.php b/template-parts/content-page.php
index f0601c5..e837d96 100644
--- a/template-parts/content-page.php
+++ b/template-parts/content-page.php
@@ -23,7 +23,16 @@
 	</div><!-- .entry-content -->
 
 	<footer class="entry-footer">
-		<?php edit_post_link( esc_html__( 'Edit', '_s' ), '<span class="edit-link">', '</span>' ); ?>
+		<?php
+			edit_post_link(
+				sprintf(
+					esc_html_x( 'Edit %s', 'name of current post', '_s' ),
+					wp_kses( the_title( '<span class="screen-reader-text">"', '"</span>', false ), array( 'span' => array( 'class' => array() ) ) )
+				),
+				'<span class="edit-link">',
+				'</span>'
+			);
+		?>
 	</footer><!-- .entry-footer -->
 </article><!-- #post-## -->