diff --git a/src/dlangide/ui/commands.d b/src/dlangide/ui/commands.d
index 72979e1..fda7548 100644
--- a/src/dlangide/ui/commands.d
+++ b/src/dlangide/ui/commands.d
@@ -102,4 +102,4 @@ const Action ACTION_ADD_TO_CURRENT_WORKSPACE = new Action(IDEActions.AddToCurren
 
 const Action ACTION_GO_TO_DEFINITION = (new Action(IDEActions.GoToDefinition,  "GO_TO_DEFINITION"c, ""c, KeyCode.KEY_G, KeyFlag.Control)).addAccelerator(KeyCode.F12, 0).disableByDefault();
 const Action ACTION_GET_COMPLETIONS = (new Action(IDEActions.GetCompletionSuggestions,  "SHOW_COMPLETIONS"c, ""c, KeyCode.KEY_G, KeyFlag.Control|KeyFlag.Shift)).addAccelerator(KeyCode.SPACE, KeyFlag.Control).disableByDefault();
-const Action ACTION_FIND_TEXT = (new Action(IDEActions.FindText,  "FIND_TEXT"c, ""c, KeyCode.KEY_F, KeyFlag.Control));
+const Action ACTION_FIND_TEXT = (new Action(IDEActions.FindText,  "FIND_TEXT"c, "edit-find"c, KeyCode.KEY_F, KeyFlag.Control));
diff --git a/src/dlangide/ui/searchPanel.d b/src/dlangide/ui/searchPanel.d
index b3445e9..f2e90fc 100644
--- a/src/dlangide/ui/searchPanel.d
+++ b/src/dlangide/ui/searchPanel.d
@@ -113,7 +113,21 @@ class SearchWidget : TabWidget {
         string filename;
         SearchMatch[] matches;
     }
-	
+
+    bool onFindButtonPressed(Widget source) {
+        dstring txt = _findText.text;
+        if (txt.length > 0)
+		    findText(txt);
+		return true;
+    }
+
+	protected bool onEditorAction(const Action action) {
+		if (action.id == EditorActions.InsertNewLine) {
+			return onFindButtonPressed(this);
+		}
+		return false;
+	}
+
 	this(string ID, IDEFrame frame) {
 		super(ID);
 		_frame = frame;
@@ -129,13 +143,11 @@ class SearchWidget : TabWidget {
 		_findText = new EditLine();
 		_findText.padding(Rect(5,4,50,4));
 		_findText.layoutWidth(400);
+		_findText.editorActionListener = &onEditorAction; // to handle Enter key press in editor
 		_layout.addChild(_findText);
 		
-		auto goButton = new ImageButton("findTextButton", "edit-redo");
-		goButton.addOnClickListener( delegate(Widget) {
-				findText(_findText.text);
-				return true;
-			});
+		auto goButton = new ImageButton("findTextButton", "edit-find");
+		goButton.onClickListener = &onFindButtonPressed;
 		_layout.addChild(goButton);
         
         _searchScope = new ComboBox("searchScope", ["File"d, "Project"d, "Dependencies"d, "Everywhere"d]);
diff --git a/views/res/mdpi/edit-find.png b/views/res/mdpi/edit-find.png
new file mode 100644
index 0000000..4ecdd9a
Binary files /dev/null and b/views/res/mdpi/edit-find.png differ
diff --git a/views/resources.list b/views/resources.list
index 51eb8d2..c81c46c 100644
--- a/views/resources.list
+++ b/views/resources.list
@@ -13,6 +13,7 @@ res/mdpi/document-save-as.png
 res/mdpi/document-save.png
 res/mdpi/edit-copy.png
 res/mdpi/edit-cut.png
+res/mdpi/edit-find.png
 res/mdpi/edit-indent.png
 res/mdpi/edit-paste.png
 res/mdpi/edit-redo.png