--- a/src/main/webapp/imageServer/displayDigiList.xhtml	Thu May 21 10:36:37 2015 +0000
+++ b/src/main/webapp/imageServer/displayDigiList.xhtml	Thu May 21 16:36:53 2015 +0000
@@ -51,19 +51,31 @@
 						
 						<rich:column style="border:none;">
 							<f:facet name="header">
+								<script>
+									function handlerKeyPress(event) {
+										// if enter key is pressed
+										if (event.keyCode == 13) {
+											event.target.blur();
+											event.stopPropagation();
+											return false;
+										} else {
+											return true;
+										}
+									}
+								</script>
 								<h:outputText value="Digitalization" 
 									styleClass="rf-dt-shdr-c"/>
 								<br/>
 								<rich:autocomplete mode="client" autocompleteList="#{Session.digiList.suggesstionList}"
-	            					var="suggestion" fetchValue="#{suggestion}" layout="div"
-	            					value="#{Session.digiList.filterTerm}" >
+	            					var="suggestion" fetchValue="#{suggestion}" layout="div" selectFirst="false"
+	            					value="#{Session.digiList.filterTerm}" onkeypress="return handlerKeyPress(event);" >
 	            					<b>#{suggestion}</b>
-	            					<a4j:ajax event="change" render="digiListPanel" listener="#{Session.digiList.eventFilter}" />  
+									<a4j:ajax event="change" render="digiListPanel" listener="#{Session.digiList.eventFilter}" />
 	        					</rich:autocomplete>
 							</f:facet>
-							
+
 							<h:outputText value="[#{digi.entity.id}] #{digi.entity.ownValue}" />
-							
+
 							<h:outputLink value="#{ApplicationBean1.root}/imageServer/displayDigi.jsp?digiId=#{digi.entity.id}">
 								<h:graphicImage url="#{ApplicationBean1.displayImage}" width="18" height="18"/>
 							</h:outputLink>