diff --git a/image.php b/image.php
index fdac043..2db50fe 100644
--- a/image.php
+++ b/image.php
@@ -7,7 +7,7 @@
  */
 
 get_header();
-wp_enqueue_script( 'keyboard-navigation', get_template_directory_uri() . '/js/keyboard-navigation.js', array( 'jquery' ), '20120202' );
+wp_enqueue_script( 'keyboard-image-navigation', get_template_directory_uri() . '/js/keyboard-image-navigation.js', array( 'jquery' ), '20120202' );
 ?>
 
 		<div id="primary" class="site-content" class="image-attachment">
diff --git a/js/keyboard-navigation.js b/js/keyboard-image-navigation.js
similarity index 87%
rename from js/keyboard-navigation.js
rename to js/keyboard-image-navigation.js
index 80a22b1..323af7f 100644
--- a/js/keyboard-navigation.js
+++ b/js/keyboard-image-navigation.js
@@ -5,7 +5,7 @@ jQuery( document ).ready( function( $ ) {
 			url = $( '.previous-image a' ).attr( 'href' );
 		}
 		else if ( e.which == 39 ) {  // Right arrow key code
-			url = $( '.next-image a' ).attr( 'href' );
+			url = $( '.entry-attachment a' ).attr( 'href' );
 		}
 		if ( url && ( !$( 'textarea, input' ).is( ':focus' ) ) ) {
 			window.location = url;