diff --git a/content-page.php b/content-page.php
index fde16f7..b0cc345 100644
--- a/content-page.php
+++ b/content-page.php
@@ -22,6 +22,6 @@
 	</div><!-- .entry-content -->
 
 	<footer class="entry-footer">
-		<?php _s_entry_meta(); ?>
+		<?php edit_post_link( __( 'Edit', '_s' ), '<span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-footer -->
 </article><!-- #post-## -->
diff --git a/content-search.php b/content-search.php
index f142604..9786ba3 100644
--- a/content-search.php
+++ b/content-search.php
@@ -24,6 +24,7 @@
 	</div><!-- .entry-summary -->
 
 	<footer class="entry-footer">
-		<?php _s_entry_meta(); ?>
+		<?php _s_entry_footer(); ?>
+		<?php edit_post_link( __( 'Edit', '_s' ), '<span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-footer -->
 </article><!-- #post-## -->
diff --git a/content-single.php b/content-single.php
index 20c5d7d..130db9a 100644
--- a/content-single.php
+++ b/content-single.php
@@ -24,6 +24,7 @@
 	</div><!-- .entry-content -->
 
 	<footer class="entry-footer">
-		<?php _s_entry_meta(); ?>
+		<?php _s_entry_footer(); ?>
+		<?php edit_post_link( __( 'Edit', '_s' ), '<span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-footer -->
 </article><!-- #post-## -->
diff --git a/content.php b/content.php
index 200bcc6..9efa5cb 100644
--- a/content.php
+++ b/content.php
@@ -26,6 +26,7 @@
 	</div><!-- .entry-content -->
 
 	<footer class="entry-footer">
-		<?php _s_entry_meta(); ?>
+		<?php _s_entry_footer(); ?>
+		<?php edit_post_link( __( 'Edit', '_s' ), '<span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-footer -->
 </article><!-- #post-## -->
diff --git a/inc/template-tags.php b/inc/template-tags.php
index 57023a5..7a846af 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -134,11 +134,11 @@ function _s_category_transient_flusher() {
 add_action( 'edit_category', '_s_category_transient_flusher' );
 add_action( 'save_post',     '_s_category_transient_flusher' );
 
-if ( ! function_exists( '_s_entry_meta' ) ) :
+if ( ! function_exists( '_s_entry_footer' ) ) :
 /**
- * Prints HTML with meta information for the categories, tags, comments and edit link.
+ * Prints HTML with meta information for the categories, tags and comments.
  */
-function _s_entry_meta() {
+function _s_entry_footer() {
 	/* Hide category and tag text for pages */
 	if ( 'post' == get_post_type() ) {
 		/* translators: used between list items, there is a space after the comma */
@@ -154,12 +154,10 @@ function _s_entry_meta() {
 		}
 	}
 
-	if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) {
+	if ( ! is_single() && ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) {
 		echo '<span class="comments-link">';
 		comments_popup_link( __( 'Leave a comment', '_s' ), __( '1 Comment', '_s' ), __( '% Comments', '_s' ) );
 		echo '</span>';
 	}
-
-	edit_post_link( __( 'Edit', '_s' ), '<span class="edit-link">', '</span>' );
 }
 endif;