diff --git a/public/css/style.css b/public/css/style.css
index 23b2dc9..7462717 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -74,5 +74,6 @@ div#box {background-image: url('/img/back.png'); background-repeat: no-repeat; b
 /*Leaflet FIX*/
 .leaflet-popup-content-wrapper .leaflet-popup-scrolled {border-bottom: none;border-top: none;}
 
-#suggestContainer {position: absolute;top: 40px;background-color: #fff;padding-bottom: 8px; border-bottom: 1px solid #333; width: 219px; display: none;max-height: 345px;overflow-y: scroll;}
-#suggestContainer > div:hover {background-color: #eee;}
\ No newline at end of file
+#suggestContainer {position: absolute;top: 40px;background-color: #fff;padding-bottom: 8px; border-bottom: 1px solid #333; width: 100%; display: none;}
+#suggestContainer > div:hover {background-color: #eee;}
+#suggestContainer > div.hover {background-color: #eee;}
\ No newline at end of file
diff --git a/public/js/suggest.js b/public/js/suggest.js
index e470f84..799ca21 100644
--- a/public/js/suggest.js
+++ b/public/js/suggest.js
@@ -30,7 +30,6 @@ function suggestInit(selector)
 
 function suggestKeyPress(key)
 {
-	console.log(key);
 	switch (key) {
 		case 27:
 				//ESCAPE
@@ -38,15 +37,41 @@ function suggestKeyPress(key)
 			break
 		case 13:
 				//ENTER
+				if ( $('div.hover','#suggestContainer').length > 0 ) {
+					link = $('a', $('div.hover','#suggestContainer')).attr('href');
+				} else {
+					link = $('a', $('div','#suggestContainer').first()).attr('href');
+				}
+				window.location.href = link;
 			break
 		case 38:
 				//UP
+				if ( $('div.hover','#suggestContainer').length > 0 ) {
+					if ($('div.hover','#suggestContainer').prev()) {
+						$('div.hover','#suggestContainer').removeClass('hover').prev().addClass('hover');
+					} else {
+						$('div','#suggestContainer').removeClass('hover').last().addClass('hover');
+					}
+				} else {
+					$('div','#suggestContainer').last().addClass('hover');
+				}
 			break
 		case 40:
 				//DOWN
+				if ( $('div.hover','#suggestContainer').length > 0 ) {
+					if ($('div.hover','#suggestContainer').next()) {
+						$('div.hover','#suggestContainer').removeClass('hover').next().addClass('hover');
+					} else {
+						$('div','#suggestContainer').removeClass('hover').first().addClass('hover');
+					}
+				} else {
+					$('div','#suggestContainer').first().addClass('hover');
+				}
 			break
 		default :
-			$('#suggestContainer').show();
+			if($(suggestSelector).val()) {
+				$('#suggestContainer').show();
+			}
 	}
 
 }