diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 2c35ab29f..6a0677b7d 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -506,9 +506,8 @@ function get_pagenum_link($pagenum = 1) {
 
 		$base = trailingslashit( get_bloginfo( 'url' ) );
 
-		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || ( 'page' == get_option('show_on_front') && get_option('page_on_front') )) ) {
+		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
 			$base .= 'index.php/';
-		}
 
 		if ( $pagenum > 1 ) {
 			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( 'page/' . $pagenum, 'paged' );