Index: /CKEditor/branches/features/aria/_source/plugins/templates/dialogs/templates.js
===================================================================
--- /CKEditor/branches/features/aria/_source/plugins/templates/dialogs/templates.js	(revision 5087)
+++ /CKEditor/branches/features/aria/_source/plugins/templates/dialogs/templates.js	(revision 5088)
@@ -109,11 +109,9 @@
 						{
 							case 40 :					// ARROW-DOWN
-								focusItem = target.getNext()
-										|| items.getItem( 0 );
+								focusItem = target.getNext();
 								break;
 
 							case 38 :					// ARROW-UP
-								focusItem = target.getPrevious()
-										|| items.getItem( items.count() - 1 );
+								focusItem = target.getPrevious();
 								break;