diff --git a/src/nt/UI/control/JSearchBarController.java b/src/nt/UI/control/JSearchBarController.java
index 413e6a0..97388d8 100644
--- a/src/nt/UI/control/JSearchBarController.java
+++ b/src/nt/UI/control/JSearchBarController.java
@@ -113,7 +113,7 @@ public class JSearchBarController extends KeyAdapter implements DocumentListener
 	@Override
 	public void keyPressed(KeyEvent e) {
 		if(this.searchBar.completionActive) {
-			JList<?> list = searchBar.dropDown.list;
+			JList<String> list = searchBar.dropDown.list;
 			int index = list.getSelectedIndex();
 			if(e.getKeyCode() == KeyEvent.VK_DOWN) {
 				index = index >= list.getModel().getSize()? list.getModel().getSize()-1:++index;
@@ -122,6 +122,12 @@ public class JSearchBarController extends KeyAdapter implements DocumentListener
 			}
 			list.setSelectedIndex(index);
 			list.ensureIndexIsVisible(index);
+			
+			if(e.getKeyCode()==KeyEvent.VK_ENTER) {
+				searchBar.txtSearch.setText(list.getSelectedValue());
+				System.out.println(list.getSelectedValue());
+				System.out.println(searchBar.txtSearch.getText());
+			}
 		}
 	}
 	
@@ -165,12 +171,12 @@ public class JSearchBarController extends KeyAdapter implements DocumentListener
 
 	@Override
 	public void valueChanged(ListSelectionEvent e) {
-		String val = searchBar.dropDown.list.getSelectedValue();
-		if(val != null) {
-			JTextField field = searchBar.txtSearch;
-			field.setText(val);
-			field.setCaretPosition(field.getText().length());
-		}
+//		String val = searchBar.dropDown.list.getSelectedValue();
+//		if(val != null) {
+//			JTextField field = searchBar.txtSearch;
+//			field.setText(val);
+//			field.setCaretPosition(field.getText().length());
+//		}
 		
 	}
 
diff --git a/src/nt/UI/control/JSearchTextField.java b/src/nt/UI/control/JSearchTextField.java
index 47ec2e8..04491fc 100644
--- a/src/nt/UI/control/JSearchTextField.java
+++ b/src/nt/UI/control/JSearchTextField.java
@@ -44,15 +44,7 @@ public class JSearchTextField extends JPanel{
 		horizontalStrut = Box.createHorizontalStrut(10);
 		add(horizontalStrut);
 		
-		txtSearch = new JTextField() {
-			private static final long serialVersionUID = 1L;
-			
-			@Override
-			public void setText(String txt) {
-				
-			}
-			
-		};
+		txtSearch = new JTextField();
 		txtSearch.setText("search");
 		txtSearch.setBorder(new EmptyBorder(0, 0, 0, 0));
 		txtSearch.setBackground(getBackground());